diff --git a/nixosModules/clanCore/vars/secret/sops/collectFiles.nix b/nixosModules/clanCore/vars/secret/sops/collectFiles.nix index c6cbe0550..697c59861 100644 --- a/nixosModules/clanCore/vars/secret/sops/collectFiles.nix +++ b/nixosModules/clanCore/vars/secret/sops/collectFiles.nix @@ -5,33 +5,31 @@ let inherit (lib) filterAttrs - flatten mapAttrsToList ; -in -generators: -let - relevantFiles = - generator: - filterAttrs ( - _name: f: f.secret && f.deploy && (f.neededFor == "users" || f.neededFor == "services") - ) generator.files; - allFiles = flatten ( - mapAttrsToList ( - gen_name: generator: - mapAttrsToList (fname: file: { - name = fname; - generator = gen_name; - neededForUsers = file.neededFor == "users"; - inherit (generator) share; - inherit (file) - owner - group - mode - restartUnits - ; - }) (relevantFiles generator) - ) generators + + relevantFiles = filterAttrs ( + _name: f: f.secret && f.deploy && (f.neededFor == "users" || f.neededFor == "services") ); + + collectFiles = + generators: + builtins.concatLists ( + mapAttrsToList ( + gen_name: generator: + mapAttrsToList (fname: file: { + name = fname; + generator = gen_name; + neededForUsers = file.neededFor == "users"; + inherit (generator) share; + inherit (file) + owner + group + mode + restartUnits + ; + }) (relevantFiles generator.files) + ) generators + ); in -allFiles +collectFiles