From bffd0005be1f04ca632b056262d58e2eb5d5773f Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 25 Dec 2024 22:09:52 +0100 Subject: [PATCH] vars password-store: fix usage with newer vars --- nixosModules/clanCore/vars/secret/password-store.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixosModules/clanCore/vars/secret/password-store.nix b/nixosModules/clanCore/vars/secret/password-store.nix index c544798ed..4f541d661 100644 --- a/nixosModules/clanCore/vars/secret/password-store.nix +++ b/nixosModules/clanCore/vars/secret/password-store.nix @@ -41,10 +41,10 @@ let useSystemdActivation = (options.systemd ? sysusers && config.systemd.sysusers.enable) || (options.services ? userborn && config.services.userborn.enable); - normalSecrets = lib.any (gen: lib.any (file: !file.neededForUsers) (lib.attrValues gen.files)) ( - lib.attrValues config.clan.core.vars.generators - ); - userSecrets = lib.any (gen: lib.any (file: file.neededForUsers) (lib.attrValues gen.files)) ( + normalSecrets = lib.any ( + gen: lib.any (file: file.neededFor == "services") (lib.attrValues gen.files) + ) (lib.attrValues config.clan.core.vars.generators); + userSecrets = lib.any (gen: lib.any (file: file.neededFor == "users") (lib.attrValues gen.files)) ( lib.attrValues config.clan.core.vars.generators );