diff --git a/modules/features/desktop/default.nix b/modules/features/desktop/default.nix new file mode 100644 index 0000000..3bef1be --- /dev/null +++ b/modules/features/desktop/default.nix @@ -0,0 +1,18 @@ +{ self, inputs, ... }: { + + flake.nixosModules.desktop = { pkgs, ... }: { + + #programs.foo = bar; + + }; + + flake.homeModules.desktop = { self, inputs, ... }; { + + imports = with self.homeModules; [ + niri + terminal + ]; + + }; + +} diff --git a/modules/features/desktop/niri.nix b/modules/features/desktop/niri.nix index f0abd09..27ab3ae 100644 --- a/modules/features/desktop/niri.nix +++ b/modules/features/desktop/niri.nix @@ -1,7 +1,7 @@ { self, inputs, ... }: { # module declaration - flake.modules.nixos.niri = { pkgs, ... }: { + flake.nixosModules.niri = { pkgs, ... }: { programs.niri = { @@ -13,20 +13,21 @@ }; # defines a niri hm config - flake.modules.homeManager.niri = + flake.homeModules.niri = { config, pkgs, lib, ... }: + { - imports = [ + imports = with self.homeModules; [ # launcher - self.modules.homeManager.wofi + wofi # desktop shell - self.modules.homeManager.noctalia + noctalia ]; @@ -41,7 +42,9 @@ settings = { }; + }; + }; }; diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 1f92f0d..0d5dee7 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -56,8 +56,8 @@ in inputs.home-manager.nixosModules.home-manager { home-manager.users.serenity = { - imports = [ - config.flake.homeModules.desktop + imports = with self.homeModules; [ + desktop ]; }; }