move modules

22 files changed, 65 insertions, 102 deletions

diff --git a/flake.lock b/flake.lock
index 070fd51..af9f1a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,11 +21,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743387206,
-        "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
+        "lastModified": 1745557122,
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743833482,
-        "narHash": "sha256-tUV7MhS/JFOEp3JQxiyvo8K3aS5zP5jcF/Buk57yWDo=",
+        "lastModified": 1745890743,
+        "narHash": "sha256-iKW6QSWBZWU/jp/AD9+rkXlhIvsPsAny0yC4hDVixi8=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "2903d897d5939324a758bd3f2cee1fbcb118b5d1",
+        "rev": "f0311ca697aabe78035bd95adb41beef332e14ee",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745804731,
-        "narHash": "sha256-v/sK3AS0QKu/Tu5sHIfddiEHCvrbNYPv8X10Fpux68g=",
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "29335f23bea5e34228349ea739f31ee79e267b88",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1743367904,
-        "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
+        "lastModified": 1745868005,
+        "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
+        "rev": "330d0a4167924b43f31cc9406df363f71b768a02",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1743595372,
-        "narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=",
+        "lastModified": 1745922559,
+        "narHash": "sha256-13U33TrQ86aCXbdfbn7DH/iZuokplIufgTkLx2iEYOU=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff",
+        "rev": "25289c6cacf0eef2812e44ed7774f87dd866d95c",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742370146,
-        "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
+        "lastModified": 1744961264,
+        "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
+        "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bb99d96..f1e63af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,19 @@
     username = "leander";
     desktop = "nixos";
 
-    pkgs = import nixpkgs { inherit system; };
+    overlays = [
+      (final: prev: {
+        discord = prev.callPackage ./modules/home-manager/discord.nix {
+          libgbm = prev.mesa;
+        };
+      })
+    ];
+
+
+    pkgs = import nixpkgs {
+      inherit system;
+      overlays = overlays;
+    };
   in {
     nixosConfigurations = {
       nixos = nixpkgs.lib.nixosSystem {
@@ -25,14 +37,16 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./hosts/nixos/configuration.nix
-
-          inputs.spicetify-nix.nixosModules.spicetify
-
+          
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
             home-manager.users.${username} = import ./hosts/nixos/home.nix;
+
+            home-manager.sharedModules = [
+              inputs.nixcord.homeModules.nixcord
+            ];
           }
         ];
       };
diff --git a/modules/home-manager/default.nix b/modules/default.nix
index ebddc5f..8a68d80 100644
--- a/modules/home-manager/default.nix
+++ b/modules/default.nix
@@ -10,6 +10,5 @@
     ./neovim/default.nix
     ./nextcloud.nix
     ./spicetify.nix
-    ./nixcord.nix
   ];
 }
diff --git a/modules/home-manager/emacs.nix b/modules/emacs.nix
index 47192a4..47192a4 100644
--- a/modules/home-manager/emacs.nix
+++ b/modules/emacs.nix
diff --git a/modules/home-manager/foot.nix b/modules/foot.nix
index 107b7bb..107b7bb 100644
--- a/modules/home-manager/foot.nix
+++ b/modules/foot.nix
diff --git a/modules/home-manager/git.nix b/modules/git.nix
index 2e44a34..2e44a34 100644
--- a/modules/home-manager/git.nix
+++ b/modules/git.nix
diff --git a/modules/home-manager/nixcord.nix b/modules/home-manager/nixcord.nix
deleted file mode 100644
index 8b085c4..0000000
--- a/modules/home-manager/nixcord.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, lib, pkgs, inputs, ... }:
-
-let
-  cfg = config.nixcord;
-in {
-  options.nixcord.enable = lib.mkEnableOption "Enable nixord and setup";
-  config = lib.mkIf cfg.enable {
-    programs.nixcord = {
-      enable = true;
-      config = {
-        themeLinks = [
-          "https://github.com/TheCommieAxolotl/BetterDiscord-Stuff/blob/main/Ultra/Ultra.theme.css"
-        ];
-        frameless = true;
-        plugins = {
-          alwaysAnimate.enable = true;
-          clearURLs.enable = true;
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home-manager/neovim/default.nix b/modules/neovim/default.nix
index 415861a..415861a 100644
--- a/modules/home-manager/neovim/default.nix
+++ b/modules/neovim/default.nix
diff --git a/modules/home-manager/neovim/lua/autocmds.lua b/modules/neovim/lua/autocmds.lua
index f7e6923..f7e6923 100644
--- a/modules/home-manager/neovim/lua/autocmds.lua
+++ b/modules/neovim/lua/autocmds.lua
diff --git a/modules/home-manager/neovim/lua/keymaps.lua b/modules/neovim/lua/keymaps.lua
index e69de29..e69de29 100644
--- a/modules/home-manager/neovim/lua/keymaps.lua
+++ b/modules/neovim/lua/keymaps.lua
diff --git a/modules/home-manager/neovim/lua/options.lua b/modules/neovim/lua/options.lua
index 891668f..891668f 100644
--- a/modules/home-manager/neovim/lua/options.lua
+++ b/modules/neovim/lua/options.lua
diff --git a/modules/home-manager/neovim/lua/plugins.lua b/modules/neovim/lua/plugins.lua
index 7c2d956..7c2d956 100644
--- a/modules/home-manager/neovim/lua/plugins.lua
+++ b/modules/neovim/lua/plugins.lua
diff --git a/modules/home-manager/nextcloud.nix b/modules/nextcloud.nix
index 6e8774f..6e8774f 100644
--- a/modules/home-manager/nextcloud.nix
+++ b/modules/nextcloud.nix
diff --git a/modules/nixcord.nix b/modules/nixcord.nix
new file mode 100644
index 0000000..a969edf
--- /dev/null
+++ b/modules/nixcord.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  cfg = config.nixcord;
+in {
+  options.nixcord.enable = lib.mkEnableOption "Enable nixord and setup";
+  config = lib.mkIf cfg.enable {
+    programs.nixcord = {
+      enable = true;  # enable Nixcord. Also installs discord package
+      #quickCss = "some CSS";  # quickCSS file
+      config = {
+        #useQuickCss = true;   # use out quickCSS
+        #themeLinks = [        # or use an online theme
+        #  "https://raw.githubusercontent.com/link/to/some/theme.css"
+        #];
+        frameless = true; # set some Vencord options
+        plugins = {
+          hideAttachments.enable = true;    # Enable a Vencord plugin
+          ignoreActivities = {    # Enable a plugin and set some options
+            enable = true;
+            ignorePlaying = true;
+            ignoreWatching = true;
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/nixos/audio.nix b/modules/nixos/audio.nix
deleted file mode 100644
index 4757803..0000000
--- a/modules/nixos/audio.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.audio;
-in {
-  options.audio.enable = lib.mkEnableOption "Enable audio with pipewire";
-  config = lib.mkIf cfg.enable {
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-  };
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index 75e6fad..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, lib, ... }: {
-  imports = [
-    ./audio.nix
-    ./wooting.nix
-  ];
-}
diff --git a/modules/nixos/wooting.nix b/modules/nixos/wooting.nix
deleted file mode 100644
index eadfe9c..0000000
--- a/modules/nixos/wooting.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.wooting;
-in {
-  options.wooting.enable = lib.mkEnableOption "Enable Wooting udev rules";
-
-  config = lib.mkIf cfg.enable {
-    services.udev.extraRules = ''
-      # Wooting One Legacy
-      SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess"
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess"
-
-      # Wooting One update mode
-      SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess"
-
-      # Wooting Two Legacy
-      SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess"
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess"
-
-      # Wooting Two update mode
-      SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess"
-
-      # Generic Wootings
-      SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess"
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess"
-    '';
-
-    environment.systemPackages = with pkgs; [
-      wootility
-    ];
-  };
-}
-
diff --git a/modules/home-manager/spicetify.nix b/modules/spicetify.nix
index d961779..d871620 100644
--- a/modules/home-manager/spicetify.nix
+++ b/modules/spicetify.nix
@@ -15,7 +15,7 @@ in {
         declutterNowPlayingBar
       ];
       theme = spicePkgs.themes.sleek;
-      colorScheme = "coral";
+      colorScheme = "Coral";
     };
   };
 }
diff --git a/modules/home-manager/sway.nix b/modules/sway.nix
index 77f1138..77f1138 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/sway.nix
diff --git a/modules/home-manager/tmux.nix b/modules/tmux.nix
index c4bfefc..c4bfefc 100644
--- a/modules/home-manager/tmux.nix
+++ b/modules/tmux.nix
diff --git a/modules/home-manager/waybar.nix b/modules/waybar.nix
index 6a54d0d..6a54d0d 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/waybar.nix
diff --git a/modules/home-manager/zsh.nix b/modules/zsh.nix
index 9dab7d8..9dab7d8 100644
--- a/modules/home-manager/zsh.nix
+++ b/modules/zsh.nix