Merge pull request #57 from Dan-Theriault/home-manager-filter

fix: improve check for home-manager nodes
oddlama · Jan 3, 2025 · d3836e5 · d3836e5
2 parents 1472730 + 71a5a60
commit d3836e5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/nix/select-nodes.nix b/nix/select-nodes.nix
@@ -13,6 +13,7 @@ let
     nameValuePair
     foldl'
     optionalAttrs
+    filterAttrs
     ;
 
   effectiveNixosConfigurations =
@@ -30,10 +31,10 @@ let
 
   findHomeManagerForHost =
     hostName: hostCfg:
-    if (hostCfg ? config.home-manager.users.age.rekey) then
-      (mapAttrs' (
-        name: value: nameValuePair "host-${hostName}-user-${name}" { config = value; }
-      ) hostCfg.config.home-manager.users)
+    if (hostCfg ? config.home-manager.users) then
+      mapAttrs' (name: value: nameValuePair "host-${hostName}-user-${name}" { config = value; }) (
+        filterAttrs (_: value: value ? age.rekey) hostCfg.config.home-manager.users
+      )
     else
       { };