diff --git a/default.nix b/default.nix index 60e29413..03446b6b 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,7 @@ inputs.home-manager.nixosModules.default # modules #i dont think this is right - ./modules + #./modules ]; nix.settings.experimental-features = [ "nix-command" "flakes"]; diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix index 41804b06..aaaac686 100644 --- a/hosts/sakotop/configuration.nix +++ b/hosts/sakotop/configuration.nix @@ -9,7 +9,7 @@ ../../default.nix ]; - config = { + modules = { desktop = { bspwm.enable = true; kitty.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 9235496b..1c872a5f 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,6 @@ { # List your module files here # my-module = import ./my-module.nix; - #desktop = ./desktop; desktop = import ./desktop; dev = import ./dev; # name conflict :( diff --git a/modules/desktop/chat/default.nix b/modules/desktop/chat/default.nix index 8485816d..af092fe3 100644 --- a/modules/desktop/chat/default.nix +++ b/modules/desktop/chat/default.nix @@ -1,3 +1,3 @@ { - discord = ./discord.nix; + discord = import ./discord.nix; } diff --git a/modules/desktop/game/default.nix b/modules/desktop/game/default.nix index dacca1d4..be044644 100644 --- a/modules/desktop/game/default.nix +++ b/modules/desktop/game/default.nix @@ -1,5 +1,5 @@ { - lutris = ./lutris.nix; - steam = ./steam.nix; - wine = ./wine.nix; + lutris = import ./lutris.nix; + steam = import ./steam.nix; + wine = import ./wine.nix; } diff --git a/modules/desktop/web/default.nix b/modules/desktop/web/default.nix index f0ea9ebe..5ef45909 100644 --- a/modules/desktop/web/default.nix +++ b/modules/desktop/web/default.nix @@ -1,3 +1,3 @@ { - qutebrowser = ./qutebrowser.nix; + qutebrowser = import ./qutebrowser.nix; } diff --git a/modules/dev/default.nix b/modules/dev/default.nix index a5853630..c2aa0442 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -1,7 +1,7 @@ { - editors = ./editors/default.nix; - cpp = ./cpp.nix; - javascript = ./javascript.nix; - python = ./python.nix; - rust = ./rust.nix; + editors = import ./editors/default.nix; + cpp = import ./cpp.nix; + javascript = import ./javascript.nix; + python = import ./python.nix; + rust = import ./rust.nix; } diff --git a/modules/devices/default.nix b/modules/devices/default.nix index f3c2d70e..60a38503 100644 --- a/modules/devices/default.nix +++ b/modules/devices/default.nix @@ -1,5 +1,5 @@ { - nvidia = ./nvidia; - bluetooth = ./bluetooth.nix; - pipewire = ./pipewire.nix; + nvidia = import ./nvidia; + bluetooth = import ./bluetooth.nix; + pipewire = import ./pipewire.nix; } diff --git a/modules/media/default.nix b/modules/media/default.nix index ef91e1a8..80b82269 100644 --- a/modules/media/default.nix +++ b/modules/media/default.nix @@ -1,4 +1,4 @@ { - mpd = ./mpd; - ncmpcpp = ./ncmpcpp; + mpd = import ./mpd; + ncmpcpp = import ./ncmpcpp; } diff --git a/modules/shell/default.nix b/modules/shell/default.nix index f3e629ed..0d48b213 100644 --- a/modules/shell/default.nix +++ b/modules/shell/default.nix @@ -1,4 +1,4 @@ { - zsh = ./zsh.nix; - newsboat = ./newsboat.nix; + zsh = import ./zsh.nix; + newsboat = import ./newsboat.nix; }