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

chore(buildClan): move machineClass option into inventory.machines submodule

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-04-09 11:03:23 +02:00
committed by Mic92
parent 04f9aa3ae0
commit 68ca94d1ee
4 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,16 +164,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
@@ -184,7 +186,7 @@ let
lib.nameValuePair system (
lib.mapAttrs (
name: _:
moduleSystemConstructor.${machineClass.${name}} {
moduleSystemConstructor.${machineClasses.${name}} {
inherit name system;
pkgs = pkgsFor.${system};
}
@@ -199,7 +201,7 @@ let
lib.nameValuePair system (
lib.mapAttrs (
name: _: args:
moduleSystemConstructor.${machineClass.${name}} (
moduleSystemConstructor.${machineClasses.${name}} (
args
// {
inherit name system;