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

no longer fallback to "nixos" machineClass

Browse Source 
we should always have a value defined.
This commit is contained in:
Jörg Thalheim
2025-06-29 23:16:17 +02:00
parent 4b16a33340
commit fd689a25f5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/modules/clan/module.nix
View File

@@ -52,7 +52,7 @@ let
allMachines = config.clanInternals.inventoryClass.machines; # <- inventory.machines <- clan.machines allMachines = config.clanInternals.inventoryClass.machines; # <- inventory.machines <- clan.machines
machineClasses = lib.mapAttrs ( machineClasses = lib.mapAttrs (
name: _: inventory.machines.${name}.machineClass or "nixos" name: _: inventory.machines.${name}.machineClass
) allMachines; ) allMachines;
configurations = lib.mapAttrs ( configurations = lib.mapAttrs (
@@ -71,12 +71,12 @@ let
# - by the user # - by the user
# - by some test frameworks # - by some test frameworks
# IMPORTANT!: It is utterly important that we don't add any logic outside of these modules, as it would get tested. # IMPORTANT!: It is utterly important that we don't add any logic outside of these modules, as it would get tested.
nixosModules' = lib.filterAttrs ( nixosModules' = lib.filterAttrs (name: _: inventory.machines.${name}.machineClass == "nixos") (
name: _: inventory.machines.${name}.machineClass or "nixos" == "nixos" config.outputs.moduleForMachine
) (config.outputs.moduleForMachine); );
darwinModules' = lib.filterAttrs ( darwinModules' = lib.filterAttrs (name: _: inventory.machines.${name}.machineClass == "darwin") (
name: _: inventory.machines.${name}.machineClass or "nixos" == "darwin" config.outputs.moduleForMachine
) (config.outputs.moduleForMachine); );
nixosModules = flip mapAttrs' nixosModules' ( nixosModules = flip mapAttrs' nixosModules' (
name: machineModule: { name: machineModule: {