systems+modules: add secretsDir specialArg

2 files changed, 9 insertions, 7 deletions

diff --git a/modules/nixos/server/acme.nix b/modules/nixos/server/acme.nix
index e8f0b78..edb499c 100644
--- a/modules/nixos/server/acme.nix
+++ b/modules/nixos/server/acme.nix
@@ -1,6 +1,10 @@
-{config, ...}: {
+{
+  config,
+  secretsDir,
+  ...
+}: {
   age.secrets = {
-    cloudflareApiKey.file = ../../../secrets/${config.networking.hostName}/cloudflareApiKey.age;
+    cloudflareApiKey.file = secretsDir + "/cloudflareApiKey.age";
   };
 
   security.acme = {
diff --git a/modules/nixos/server/secrets.nix b/modules/nixos/server/secrets.nix
index be323df..1d572bd 100644
--- a/modules/nixos/server/secrets.nix
+++ b/modules/nixos/server/secrets.nix
@@ -1,12 +1,10 @@
-{config, ...}: let
-  baseDir = ../../../secrets/${config.networking.hostName};
-in {
+{secretsDir, ...}: {
   age = {
     identityPaths = ["/etc/age/key"];
 
     secrets = {
-      rootPassword.file = "${baseDir}/rootPassword.age";
-      userPassword.file = "${baseDir}/userPassword.age";
+      rootPassword.file = secretsDir + "/rootPassword.age";
+      userPassword.file = secretsDir + "/userPassword.age";
     };
   };
 }