From aa557f3a96fefa931933788b298f0c8476964500 Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 12 May 2025 15:30:11 +0700 Subject: [PATCH] vars: cleanup sops file module --- nixosModules/clanCore/vars/secret/sops/default.nix | 2 +- nixosModules/clanCore/vars/secret/sops/funcs.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixosModules/clanCore/vars/secret/sops/default.nix b/nixosModules/clanCore/vars/secret/sops/default.nix index 79fd32531..a9228f2a0 100644 --- a/nixosModules/clanCore/vars/secret/sops/default.nix +++ b/nixosModules/clanCore/vars/secret/sops/default.nix @@ -18,7 +18,7 @@ let config.clan.core.settings.directory + "/vars/per-machine/${machineName}/${secret.generator}/${secret.name}/secret"; - vars = collectFiles config.clan.core.vars; + vars = collectFiles config.clan.core.vars.generators; in { config.clan.core.vars.settings = lib.mkIf (config.clan.core.vars.settings.secretStore == "sops") { diff --git a/nixosModules/clanCore/vars/secret/sops/funcs.nix b/nixosModules/clanCore/vars/secret/sops/funcs.nix index bf9095dd1..1fb3bd15f 100644 --- a/nixosModules/clanCore/vars/secret/sops/funcs.nix +++ b/nixosModules/clanCore/vars/secret/sops/funcs.nix @@ -13,7 +13,7 @@ in { collectFiles = - vars: + generators: let relevantFiles = generator: @@ -30,7 +30,7 @@ in inherit (generator) share; inherit (file) owner group mode; }) (relevantFiles generator) - ) vars.generators + ) generators ); in allFiles;