yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reapply "Merge pull request 'chore(buildClan): move machineClass option into inventory.machines submodule' (#3259) from hsjobeki/clan-core:buildclan-cleanup into main"

Browse Source 
This reverts commit 6154b4cb3a.
This commit is contained in:
Johannes Kirschbauer
2025-04-09 18:16:35 +02:00
parent 126d1797c8
commit cd11835ec4
5 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/build-clan/module.nix
View File

@@ -162,16 +162,18 @@ let
};
};
allMachines = inventory.machines or { } // machines;
allMachines = inventoryClass.machines;
machineClass = lib.mapAttrs (name: _: inventory.machineClass.${name} or "nixos") allMachines;
configurations = lib.mapAttrs (
name: _: moduleSystemConstructor.${machineClass.${name}} { inherit name; }
machineClasses = lib.mapAttrs (
name: _: inventory.machines.${name}.machineClass or "nixos"
) allMachines;
nixosConfigurations = lib.filterAttrs (name: _: machineClass.${name} == "nixos") configurations;
darwinConfigurations = lib.filterAttrs (name: _: machineClass.${name} == "darwin") configurations;
configurations = lib.mapAttrs (
name: _: moduleSystemConstructor.${machineClasses.${name}} { inherit name; }
) allMachines;
nixosConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "nixos") configurations;
darwinConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "darwin") configurations;
# This instantiates NixOS for each system that we support:
# configPerSystem = <system>.<machine>.nixosConfiguration
@@ -182,7 +184,7 @@ let
lib.nameValuePair system (
lib.mapAttrs (
name: _:
moduleSystemConstructor.${machineClass.${name}} {
moduleSystemConstructor.${machineClasses.${name}} {
inherit name system;
pkgs = pkgsFor.${system};
}
@@ -197,7 +199,7 @@ let
lib.nameValuePair system (
lib.mapAttrs (
name: _: args:
moduleSystemConstructor.${machineClass.${name}} (
moduleSystemConstructor.${machineClasses.${name}} (
args
// {
inherit name system;