From c6b973738ba969602f1026ad6b960a112cd603e1 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Thu, 19 Feb 2026 08:06:54 -0600
Subject: [PATCH] fix: paths to secrets files because of new folder structure

---
 hosts/unstable/exodus/default.nix   |  2 +-
 hosts/unstable/isaiah/default.nix   |  6 +++---
 hosts/unstable/jeremiah/default.nix | 12 ++++++------
 hosts/unstable/linode/nextcloud.nix |  6 ++++--
 hosts/unstable/zeke/default.nix     |  2 +-
 hosts/vm/gitlab/default.nix         |  6 +++---
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/hosts/unstable/exodus/default.nix b/hosts/unstable/exodus/default.nix
index a214510..81da8e4 100644
--- a/hosts/unstable/exodus/default.nix
+++ b/hosts/unstable/exodus/default.nix
@@ -13,7 +13,7 @@
   ];
 
   age.secrets = {
-    compose-attic.file = ../../secrets/compose/attic.env.age;
+    compose-attic.file = ../../../secrets/compose/attic.env.age;
   };
 
   boot = {
diff --git a/hosts/unstable/isaiah/default.nix b/hosts/unstable/isaiah/default.nix
index 44222f4..b7c2db6 100644
--- a/hosts/unstable/isaiah/default.nix
+++ b/hosts/unstable/isaiah/default.nix
@@ -10,9 +10,9 @@
   ];
 
   age.secrets = {
-    gitea-runner-isaiah-podman.file = ../../secrets/gitea/runner-isaiah-podman.age;
-    gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age;
-    runner-reg.file = ../../secrets/gitlab/kubernetes-k3s-local.age;
+    gitea-runner-isaiah-podman.file = ../../../secrets/gitea/runner-isaiah-podman.age;
+    gitea-workerPassword.file = ../../../secrets/gitea/workerPassword.age;
+    runner-reg.file = ../../../secrets/gitlab/kubernetes-k3s-local.age;
   };
 
   boot = {
diff --git a/hosts/unstable/jeremiah/default.nix b/hosts/unstable/jeremiah/default.nix
index e3ed6ab..ae7b8ec 100644
--- a/hosts/unstable/jeremiah/default.nix
+++ b/hosts/unstable/jeremiah/default.nix
@@ -23,13 +23,13 @@ in
   ];
 
   age.secrets = {
-    runner-reg.file = ../../secrets/gitlab/nixos-qemu-shell.age;
+    runner-reg.file = ../../../secrets/gitlab/nixos-qemu-shell.age;
 
-    gitea-buildbotWorkersFile = mk ../../secrets/gitea/buildbotWorkersFile.age;
-    gitea-oauthToken = mk ../../secrets/gitea/oauthToken.age;
-    gitea-oauthSecret = mk ../../secrets/gitea/oauthSecret.age;
-    gitea-webhookSecret = mk ../../secrets/gitea/webhookSecret.age;
-    gitea-workerPassword = mk ../../secrets/gitea/workerPassword.age;
+    gitea-buildbotWorkersFile = mk ../../../secrets/gitea/buildbotWorkersFile.age;
+    gitea-oauthToken = mk ../../../secrets/gitea/oauthToken.age;
+    gitea-oauthSecret = mk ../../../secrets/gitea/oauthSecret.age;
+    gitea-webhookSecret = mk ../../../secrets/gitea/webhookSecret.age;
+    gitea-workerPassword = mk ../../../secrets/gitea/workerPassword.age;
   };
 
   # Bootloader.
diff --git a/hosts/unstable/linode/nextcloud.nix b/hosts/unstable/linode/nextcloud.nix
index c1a0019..22570f7 100644
--- a/hosts/unstable/linode/nextcloud.nix
+++ b/hosts/unstable/linode/nextcloud.nix
@@ -6,8 +6,10 @@
 }:
 
 {
-  age.secrets.nextcloudadmin.file = ../../secrets/nextcloudadmin.age;
-  age.secrets.nextcloudadmin.owner = "nextcloud";
+  age.secrets.nextcloudadmin = {
+    file = ../../../secrets/nextcloudadmin.age;
+    owner = "nextcloud";
+  };
 
   services.nextcloud = {
     enable = true;
diff --git a/hosts/unstable/zeke/default.nix b/hosts/unstable/zeke/default.nix
index 7721a14..e1dcb7e 100644
--- a/hosts/unstable/zeke/default.nix
+++ b/hosts/unstable/zeke/default.nix
@@ -15,7 +15,7 @@
   ];
 
   age.secrets = {
-    gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age;
+    gitea-workerPassword.file = ../../../secrets/gitea/workerPassword.age;
   };
 
   boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
diff --git a/hosts/vm/gitlab/default.nix b/hosts/vm/gitlab/default.nix
index 26d8f14..aace489 100644
--- a/hosts/vm/gitlab/default.nix
+++ b/hosts/vm/gitlab/default.nix
@@ -21,7 +21,7 @@ in
   age.secrets =
     let
       cfg = n: {
-        file = ../../secrets/gitlab/${n}.age;
+        file = ../../../secrets/gitlab/${n}.age;
         owner = "gitlab";
         group = "gitlab";
         mode = "0444";
@@ -40,13 +40,13 @@ in
       gitlab-deterministic-key = cfg "deterministic-key";
 
       minio_access_key_id = {
-        file = ../../secrets/minio_access_key_id.age;
+        file = ../../../secrets/minio_access_key_id.age;
         owner = "gitlab";
         group = "gitlab";
         mode = "0444";
       };
       minio_secret_access_key = {
-        file = ../../secrets/minio_secret_access_key.age;
+        file = ../../../secrets/minio_secret_access_key.age;
         owner = "gitlab";
         group = "gitlab";
         mode = "0444";