From fd689a25f543387dbfaac826f2555571b4a6bccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Jun 2025 23:16:17 +0200 Subject: [PATCH] no longer fallback to "nixos" machineClass we should always have a value defined. --- lib/modules/clan/module.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/modules/clan/module.nix b/lib/modules/clan/module.nix index 4ea328dfd..f993e9989 100644 --- a/lib/modules/clan/module.nix +++ b/lib/modules/clan/module.nix @@ -52,7 +52,7 @@ let allMachines = config.clanInternals.inventoryClass.machines; # <- inventory.machines <- clan.machines machineClasses = lib.mapAttrs ( - name: _: inventory.machines.${name}.machineClass or "nixos" + name: _: inventory.machines.${name}.machineClass ) allMachines; configurations = lib.mapAttrs ( @@ -71,12 +71,12 @@ let # - by the user # - 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. - nixosModules' = lib.filterAttrs ( - name: _: inventory.machines.${name}.machineClass or "nixos" == "nixos" - ) (config.outputs.moduleForMachine); - darwinModules' = lib.filterAttrs ( - name: _: inventory.machines.${name}.machineClass or "nixos" == "darwin" - ) (config.outputs.moduleForMachine); + nixosModules' = lib.filterAttrs (name: _: inventory.machines.${name}.machineClass == "nixos") ( + config.outputs.moduleForMachine + ); + darwinModules' = lib.filterAttrs (name: _: inventory.machines.${name}.machineClass == "darwin") ( + config.outputs.moduleForMachine + ); nixosModules = flip mapAttrs' nixosModules' ( name: machineModule: {