From 9cadcc13268f004dbb0eee6cf61250d1101c2d9a Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Wed, 7 Feb 2024 11:21:47 -0500
Subject: [PATCH] secrets: refactor to get files from secrets.nix

---
 secrets/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/secrets/default.nix b/secrets/default.nix
index 968c11b..1844378 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -1,14 +1,11 @@
 { lib, self, config, ... }:
+with lib;
 let
-  inherit (lib) filterAttrs nameValuePair hasSuffix removeSuffix mapAttrs mapAttrs' hasAttr mkIf mkMerge optionalAttrs;
   inherit (lib.our) mkOpt;
   inherit (lib.types) bool attrsOf path;
 
-  folder = ./.;
-  toFile = name: "${folder}/${name}";
-  filterSecrets = key: value: value == "regular" && hasSuffix ".age" key;
-  filtered = (filterAttrs filterSecrets (builtins.readDir folder));
-  secrets = mapAttrs' (n: v: nameValuePair (removeSuffix ".age" n) { file = toFile n; }) filtered;
+  mkSecret = name: nameValuePair (removeSuffix ".age" name) { file = "${./.}/${name}"; };
+  secrets = listToAttrs (map mkSecret (attrNames (import ./secrets.nix)));
 
   withOwner = name: secret: secret // { owner = name; group = name; };
 in