5 files changed, 8 insertions, 8 deletions
diff --git a/modules/nixos/features/tailscale.nix b/modules/nixos/features/tailscale.nix
index ecb793a..d29f1e6 100644
--- a/modules/nixos/features/tailscale.nix
+++ b/modules/nixos/features/tailscale.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   cfg = config.features.tailscale;
-  secretsDir = ../../../secrets/systems/${config.networking.hostName};
+  secretsDir = ../../../secrets/${config.networking.hostName};
 in {
   options.features.tailscale = {
     enable = lib.mkEnableOption "enable support for tailscale";
diff --git a/modules/nixos/server/acme.nix b/modules/nixos/server/acme.nix
index 48746c2..e8f0b78 100644
--- a/modules/nixos/server/acme.nix
+++ b/modules/nixos/server/acme.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   age.secrets = {
-    cloudflareApiKey.file = ../../../secrets/systems/${config.networking.hostName}/cloudflareApiKey.age;
+    cloudflareApiKey.file = ../../../secrets/${config.networking.hostName}/cloudflareApiKey.age;
   };
 
   security.acme = {
diff --git a/modules/nixos/server/secrets.nix b/modules/nixos/server/secrets.nix
index e435690..be323df 100644
--- a/modules/nixos/server/secrets.nix
+++ b/modules/nixos/server/secrets.nix
@@ -1,7 +1,7 @@
-{config, ...}: {
-  age = let
-    baseDir = ../../../secrets/systems/${config.networking.hostName};
-  in {
+{config, ...}: let
+  baseDir = ../../../secrets/${config.networking.hostName};
+in {
+  age = {
     identityPaths = ["/etc/age/key"];
 
     secrets = {
diff --git a/modules/nixos/services/cloudflared.nix b/modules/nixos/services/cloudflared.nix
index a144266..30aa36b 100644
--- a/modules/nixos/services/cloudflared.nix
+++ b/modules/nixos/services/cloudflared.nix
@@ -12,7 +12,7 @@ in {
 
   config = mkIf cfg.enable {
     age.secrets.cloudflaredCreds = {
-      file = ../../../secrets/systems/${config.networking.hostName}/cloudflaredCreds.age;
+      file = ../../../secrets/${config.networking.hostName}/cloudflaredCreds.age;
       mode = "400";
       owner = "cloudflared";
       group = "cloudflared";
diff --git a/modules/nixos/services/hercules.nix b/modules/nixos/services/hercules.nix
index fc3c92d..0060c08 100644
--- a/modules/nixos/services/hercules.nix
+++ b/modules/nixos/services/hercules.nix
@@ -7,7 +7,7 @@
   cfg = config.server.services.hercules-ci;
   inherit (lib) mkEnableOption mkIf;
 
-  baseDir = ../../../secrets/systems/${config.networking.hostName};
+  baseDir = ../../../secrets/${config.networking.hostName};
   hercArgs = {
     mode = "400";
     owner = "hercules-ci-agent";