From caec5ffc2ba6b61461ed968386c927b4d4c9c0c7 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 8 Apr 2026 23:33:59 -0400 Subject: [PATCH] [lib] remove `isDir` from mkServiceSecrets Just always assume directory, if we're using this function, there's enough secrets for a folder to be used. --- lib/secrets.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/secrets.nix b/lib/secrets.nix index 44bf6cfb..b297f8ae 100644 --- a/lib/secrets.nix +++ b/lib/secrets.nix @@ -1,16 +1,13 @@ { mkServiceSecrets = - service: isDir: secretsPath: secrets: - let - sep = if isDir then "/" else "-"; - in + service: secretsPath: secrets: builtins.listToAttrs ( map (sec: { name = service + "-" + sec; value = { owner = service; group = service; - file = secretsPath + /${service}${sep}${sec}.age; + file = secretsPath + /${service}/${sec}.age; }; }) secrets ); -- 2.51.2