diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 0aa87e0..1f92f0d 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -14,7 +14,7 @@ in { - # defines the hades specific config modules + # defines the hades specific configuration (glue code?) flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { # modules that comprise the host specific configuration @@ -27,6 +27,7 @@ in }; + # module set that comprises the hades configuration flake.nixosModules.hades = { pkgs, @@ -34,7 +35,9 @@ in config, ... }: + { + imports = with self.nixosModules; [ # core system modules diff --git a/modules/system/core-packages.nix b/modules/system/core-packages.nix index 00f4c77..adb7858 100644 --- a/modules/system/core-packages.nix +++ b/modules/system/core-packages.nix @@ -1,7 +1,7 @@ { inputs, ... }: { # module declaration - flake.nixosModules.packages = { pkgs, ... }: { + flake.nixosModules.core-packages = { pkgs, ... }: { # environment variables environment.variables = { diff --git a/modules/system/core.nix b/modules/system/core.nix index 39a62fa..05326c2 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -2,12 +2,12 @@ { - flake.modules.nixos.core = { pkgs, ... }: { + flake.nixosModules.core = { pkgs, ... }: { # other modules to load - imports = [ - self.nixosModules.audio - self.nixosModules.packages + imports = with self.nixosModules; [ + audio + core-packages ]; # extra features