vars: simplify collectFiles

2025-10-13 10:05:15 +02:00
parent 3c4b3e180e
commit 1c3282bb63
1 changed files with 24 additions and 26 deletions
--- a/nixosModules/clanCore/vars/secret/sops/collectFiles.nix
+++ b/nixosModules/clanCore/vars/secret/sops/collectFiles.nix
@@ -5,18 +5,16 @@
 let
  inherit (lib)
    filterAttrs
-    flatten
    mapAttrsToList
    ;
-in
-generators:
-let
-  relevantFiles =
-    generator:
-    filterAttrs (
+
+  relevantFiles = filterAttrs (
    _name: f: f.secret && f.deploy && (f.neededFor == "users" || f.neededFor == "services")
-    ) generator.files;
-  allFiles = flatten (
+  );
+
+  collectFiles =
+    generators:
+    builtins.concatLists (
      mapAttrsToList (
        gen_name: generator:
        mapAttrsToList (fname: file: {
@@ -30,8 +28,8 @@ let
            mode
            restartUnits
            ;
-      }) (relevantFiles generator)
+        }) (relevantFiles generator.files)
      ) generators
    );
 in
-allFiles
+collectFiles