From 83aa42ac79f8e461a5afcc0743eb46c1265afb9e Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 13 Feb 2025 17:38:09 +0100 Subject: [PATCH] fix(keys): Make it so agenix works again --- keys.nix | 3 ++- lib/keys/default.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/keys.nix b/keys.nix index 2d8b05c..dafe3c5 100644 --- a/keys.nix +++ b/keys.nix @@ -7,6 +7,7 @@ let inherit (bootstrap.pkgs) lib; - meta = (import ../meta lib).config; + meta = import ./meta lib; in + import ./lib/keys { inherit meta lib; } diff --git a/lib/keys/default.nix b/lib/keys/default.nix index cace4d0..992da9b 100644 --- a/lib/keys/default.nix +++ b/lib/keys/default.nix @@ -5,11 +5,13 @@ # SPDX-License-Identifier: EUPL-1.2 { meta, lib }: + let inherit (lib.extra) setDefault unique; getAttr = lib.flip builtins.getAttr; in + rec { _memberKeys = builtins.mapAttrs (_: v: v.sshKeys) meta.organization.members; _builderKeys = builtins.mapAttrs (_: v: v.builderKeys) meta.organization.members;