From 07a6858fd7ef6ea6794cc37323d7c9cf1162d5b6 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 19 Nov 2023 05:19:05 -0500
Subject: secrets: reorganize & rekey

---
 systems/atlas/default.nix  | 2 +-
 systems/atlas/miniflux.nix | 2 +-
 systems/common.nix         | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'systems')

diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix
index d241658..e6b30ca 100644
--- a/systems/atlas/default.nix
+++ b/systems/atlas/default.nix
@@ -17,7 +17,7 @@
     hermetic = false;
   };
 
-  age.secrets.teawiebot.file = ../../secrets/systems/atlas/teawieBot.age;
+  age.secrets.teawiebot.file = ../../secrets/atlas/teawieBot.age;
 
   boot = {
     loader.systemd-boot.enable = true;
diff --git a/systems/atlas/miniflux.nix b/systems/atlas/miniflux.nix
index df1c761..b142e1f 100644
--- a/systems/atlas/miniflux.nix
+++ b/systems/atlas/miniflux.nix
@@ -1,7 +1,7 @@
 {config, ...}: {
   config = {
     age.secrets = {
-      miniflux.file = ../../secrets/systems/${config.networking.hostName}/miniflux.age;
+      miniflux.file = ../../secrets/${config.networking.hostName}/miniflux.age;
     };
 
     services.miniflux = {
diff --git a/systems/common.nix b/systems/common.nix
index b1a4159..77d04c0 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -26,11 +26,11 @@ in {
 
       hmSetup
 
-      {
+      ({config, ...}: {
         age = {
           identityPaths = ["/etc/age/key"];
           secrets = let
-            baseDir = ../secrets/shared;
+            baseDir = ../secrets/${config.networking.hostName};
           in {
             rootPassword.file = "${baseDir}/rootPassword.age";
             sethPassword.file = "${baseDir}/sethPassword.age";
@@ -38,7 +38,7 @@ in {
         };
 
         system.stateVersion = "23.11";
-      }
+      })
     ];
 
   darwin = [
-- 
cgit v1.2.3