diff --git a/checks/backups/flake-module.nix b/checks/backups/flake-module.nix index 01beb4cc4..0fec6cb02 100644 --- a/checks/backups/flake-module.nix +++ b/checks/backups/flake-module.nix @@ -188,7 +188,7 @@ ] ++ # import the inventory generated nixosModules - self.clanInternals.serviceConfigs.machines.test-backup.machineImports; + self.clanInternals.inventoryClass.machines.test-backup.machineImports; clan.core.settings.directory = ./.; environment.systemPackages = [ (pkgs.writeShellScriptBin "foo" '' diff --git a/lib/build-clan/interface.nix b/lib/build-clan/interface.nix index 2ff8c9c77..20c427879 100644 --- a/lib/build-clan/interface.nix +++ b/lib/build-clan/interface.nix @@ -141,7 +141,7 @@ in moduleSchemas = lib.mkOption { type = lib.types.raw; }; inventoryFile = lib.mkOption { type = lib.types.raw; }; # The machine 'imports' generated by the inventory per machine - serviceConfigs = lib.mkOption { type = lib.types.raw; }; + inventoryClass = lib.mkOption { type = lib.types.raw; }; # clan-core's modules clanModules = lib.mkOption { type = lib.types.raw; }; source = lib.mkOption { type = lib.types.raw; }; diff --git a/lib/build-clan/module.nix b/lib/build-clan/module.nix index 40eeff8b5..09cb69c3e 100644 --- a/lib/build-clan/module.nix +++ b/lib/build-clan/module.nix @@ -42,7 +42,7 @@ let # map from machine name to service configuration # { ${machineName} :: Config } - serviceConfigs = ( + inventoryClass = ( buildInventory { inherit inventory directory; } @@ -76,7 +76,7 @@ let (machines.${name} or { }) # Inherit the inventory assertions ? # { inherit (mergedInventory) assertions; } - { imports = serviceConfigs.machines.${name}.machineImports or [ ]; } + { imports = inventoryClass.machines.${name}.machineImports or [ ]; } ( { # Settings @@ -204,7 +204,7 @@ in clanInternals = { moduleSchemas = clan-core.lib.modules.getModulesSchema config.inventory.modules; - inherit serviceConfigs; + inherit inventoryClass; inherit (clan-core) clanModules; inherit inventoryFile; inventoryValuesPrios = diff --git a/lib/inventory/build-inventory/builder/default.nix b/lib/inventory/build-inventory/builder/default.nix index fca042723..fea60509b 100644 --- a/lib/inventory/build-inventory/builder/default.nix +++ b/lib/inventory/build-inventory/builder/default.nix @@ -270,5 +270,4 @@ in } ) (inventory.machines or { }); }; - }