From c94e2e1cbf2dee18e1caeb5177a48f3981efbea3 Mon Sep 17 00:00:00 2001 From: catvayor Date: Fri, 24 Jan 2025 16:34:42 +0100 Subject: [PATCH] fix(keys/getKeys): don't fail if no key is specified --- keys/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keys/default.nix b/keys/default.nix index 05e6854..1870309 100644 --- a/keys/default.nix +++ b/keys/default.nix @@ -9,9 +9,7 @@ let meta = import ../meta lib; - getAttr = flip builtins.getAttr; - - inherit (import ../lib/nix-lib) flip setDefault unique; + inherit (import ../lib/nix-lib) setDefault unique; in rec { @@ -83,7 +81,7 @@ rec { ]; }; - getKeys = ls: builtins.concatLists (builtins.map (getAttr _keys) ls); + getKeys = ls: builtins.concatLists (builtins.map (member: _keys.${member} or [ ]) ls); mkSecrets = nodes: setDefault { publicKeys = unique (rootKeys ++ (builtins.concatMap getNodeKeys' nodes)); };