feat(meta): Use the module system to directly create the admin list from the groups

2025-02-06 13:40:36 +01:00 · 2025-02-06 13:40:36 +01:00 · 7eef4e2661
commit 7eef4e2661
parent 0433a00636
6 changed files with 40 additions and 53 deletions
--- a/lib/keys/default.nix
+++ b/lib/keys/default.nix
@ -28,11 +28,7 @@ rec {
  rootKeys = getMemberKeys meta.organization.groups.root;

  # All admins for a node
-  getNodeAdmins =
-    node:
-    meta.organization.groups.root
-    ++ meta.nodes.${node}.admins
-    ++ (builtins.concatMap (g: meta.organization.groups.${g}) meta.nodes.${node}.adminGroups);
+  getNodeAdmins = node: meta.organization.groups.root ++ meta.nodes.${node}.admins;

  # All keys needed for secret encryption
  getSecretKeys = node: unique (getMemberKeys (getNodeAdmins node) ++ getNodeKeys [ node ]);