Commit a5c7387e5f30

Vincent Demeester <vincent@sbr.pm>
2020-06-01 19:10:11
systems: fix authorizedKeys (optional -> optionals)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 1f1ba41
Changed files (2)
modules
profiles
users.nixos.nix
users
vincent
default.nix
modules/profiles/users.nixos.nix
@@ -5,13 +5,12 @@ let
   cfg = config.profiles.users;
   secretPath = ../../secrets/machines.nix;
   secretCondition = (builtins.pathExists secretPath);
-  machines = optionalAttrs secretCondition (import secretPath);
 
-  isAuthorized = p: builtins.isAttrs p && p.authorize or false;
-  authorizedKeys = lists.optional secretCondition (
+  isAuthorized = p: builtins.isAttrs p && p.authorized or false;
+  authorizedKeys = lists.optionals secretCondition (
     attrsets.mapAttrsToList
       (name: value: value.key)
-      (attrsets.filterAttrs (name: value: isAuthorized value) machines.ssh)
+      (attrsets.filterAttrs (name: value: isAuthorized value) (import secretPath).ssh)
   );
 in
 {
users/vincent/default.nix
@@ -3,13 +3,12 @@ with lib;
 let
   secretPath = ../../secrets/machines.nix;
   secretCondition = (builtins.pathExists secretPath);
-  machines = optionalAttrs secretCondition (import secretPath);
 
-  isAuthorized = p: builtins.isAttrs p && p.authorize or false;
-  authorizedKeys = lists.optional secretCondition (
+  isAuthorized = p: builtins.isAttrs p && p.authorized or false;
+  authorizedKeys = lists.optionals secretCondition (
     attrsets.mapAttrsToList
       (name: value: value.key)
-      (attrsets.filterAttrs (name: value: isAuthorized value) machines.ssh)
+      (attrsets.filterAttrs (name: value: isAuthorized value) (import secretPath).ssh)
   );
 in
 {