diff --git a/default.nix b/default.nix index 03446b6b..60e29413 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 aaaac686..41804b06 100644 --- a/hosts/sakotop/configuration.nix +++ b/hosts/sakotop/configuration.nix @@ -9,7 +9,7 @@ ../../default.nix ]; - modules = { + config = { desktop = { bspwm.enable = true; kitty.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 1c872a5f..9235496b 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,7 @@ { # 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 af092fe3..8485816d 100644 --- a/modules/desktop/chat/default.nix +++ b/modules/desktop/chat/default.nix @@ -1,3 +1,3 @@ { - discord = import ./discord.nix; + discord = ./discord.nix; } diff --git a/modules/desktop/game/default.nix b/modules/desktop/game/default.nix index be044644..dacca1d4 100644 --- a/modules/desktop/game/default.nix +++ b/modules/desktop/game/default.nix @@ -1,5 +1,5 @@ { - lutris = import ./lutris.nix; - steam = import ./steam.nix; - wine = import ./wine.nix; + lutris = ./lutris.nix; + steam = ./steam.nix; + wine = ./wine.nix; } diff --git a/modules/desktop/web/default.nix b/modules/desktop/web/default.nix index 5ef45909..f0ea9ebe 100644 --- a/modules/desktop/web/default.nix +++ b/modules/desktop/web/default.nix @@ -1,3 +1,3 @@ { - qutebrowser = import ./qutebrowser.nix; + qutebrowser = ./qutebrowser.nix; } diff --git a/modules/dev/default.nix b/modules/dev/default.nix index c2aa0442..a5853630 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -1,7 +1,7 @@ { - editors = import ./editors/default.nix; - cpp = import ./cpp.nix; - javascript = import ./javascript.nix; - python = import ./python.nix; - rust = import ./rust.nix; + editors = ./editors/default.nix; + cpp = ./cpp.nix; + javascript = ./javascript.nix; + python = ./python.nix; + rust = ./rust.nix; } diff --git a/modules/devices/default.nix b/modules/devices/default.nix index 60a38503..f3c2d70e 100644 --- a/modules/devices/default.nix +++ b/modules/devices/default.nix @@ -1,5 +1,5 @@ { - nvidia = import ./nvidia; - bluetooth = import ./bluetooth.nix; - pipewire = import ./pipewire.nix; + nvidia = ./nvidia; + bluetooth = ./bluetooth.nix; + pipewire = ./pipewire.nix; } diff --git a/modules/media/default.nix b/modules/media/default.nix index 80b82269..ef91e1a8 100644 --- a/modules/media/default.nix +++ b/modules/media/default.nix @@ -1,4 +1,4 @@ { - mpd = import ./mpd; - ncmpcpp = import ./ncmpcpp; + mpd = ./mpd; + ncmpcpp = ./ncmpcpp; } diff --git a/modules/shell/default.nix b/modules/shell/default.nix index 0d48b213..f3e629ed 100644 --- a/modules/shell/default.nix +++ b/modules/shell/default.nix @@ -1,4 +1,4 @@ { - zsh = import ./zsh.nix; - newsboat = import ./newsboat.nix; + zsh = ./zsh.nix; + newsboat = ./newsboat.nix; }