From fb217cc4b276da076b23e59a36f6d41f87d10fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 15 Jan 2025 14:31:07 +0100 Subject: [PATCH] remove flip functions from sops code --- .../clanCore/vars/secret/sops/funcs.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/nixosModules/clanCore/vars/secret/sops/funcs.nix b/nixosModules/clanCore/vars/secret/sops/funcs.nix index 63f06ab23..ed3e3d6b1 100644 --- a/nixosModules/clanCore/vars/secret/sops/funcs.nix +++ b/nixosModules/clanCore/vars/secret/sops/funcs.nix @@ -7,7 +7,6 @@ let inherit (lib) filterAttrs flatten - flip mapAttrsToList ; in @@ -18,20 +17,18 @@ in let relevantFiles = generator: - flip filterAttrs generator.files (_name: f: f.secret && f.deploy && (f.neededFor != "activation")); + filterAttrs (_name: f: f.secret && f.deploy && (f.neededFor != "activation")) generator.files; allFiles = flatten ( - flip mapAttrsToList vars.generators ( + mapAttrsToList ( gen_name: generator: - flip mapAttrsToList (relevantFiles generator) ( - fname: file: { - name = fname; - generator = gen_name; - neededForUsers = file.neededFor == "users"; - inherit (generator) share; - inherit (file) owner group; - } - ) - ) + mapAttrsToList (fname: file: { + name = fname; + generator = gen_name; + neededForUsers = file.neededFor == "users"; + inherit (generator) share; + inherit (file) owner group; + }) (relevantFiles generator) + ) vars.generators ); in allFiles;