homeFilesFromStringAttrs: full rewrite to fix glaring mistake

also adds `mergeListsToAttrs`, which takes two lists and combines them into key-value pairs as an attrset
2026-08-30 03:27:00 +01:00
parent ab89bd7fc1
commit cccf509c9f
1 changed files with 6 additions and 6 deletions
@@ -22,11 +22,11 @@

    setAttrByStrPath = strPath: value: nixpkgs.lib.setAttrByPath (nixpkgs.lib.strings.splitString "." strPath) value;

-    homeFilesFromStringAttrs = { dir, attrs, exec ? false }: nixpkgs.lib.mergeAttrsList (map (x: nixpkgs.lib.mergeAttrsList (map (y: {
-      "${dir}/${x}" = {
-        text = y;
+    homeFilesFromStringAttrs = { dir, attrs, exec ? false }: mergeListsToAttrs (map (x: "${dir}/${x}") (builtins.attrNames attrs)) (map (x: {
+      text = x;
      executable = exec;
-      };
-    }) (builtins.attrValues attrs)) ) (builtins.attrNames attrs));
+    }) (builtins.attrValues attrs));
+
+    mergeListsToAttrs = names: values: nixpkgs.lib.listToAttrs (nixpkgs.lib.zipListsWith (name: value: { inherit name value; }) names values);
  };
 }