nixos/agenix: make it a mixin

2 files changed, 11 insertions, 13 deletions

diff --git a/modules/nixos/profiles/personal.nix b/modules/nixos/profiles/personal.nix
index 84697a5..9f3615f 100644
--- a/modules/nixos/profiles/personal.nix
+++ b/modules/nixos/profiles/personal.nix
@@ -15,6 +15,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    _module.args = {
+      secretsDir = inputs.self + "/secrets/personal";
+    };
+
     borealis = {
       users = {
         seth.enable = true;
@@ -24,12 +28,5 @@ in
     services = {
       tailscale.enable = true;
     };
-
-    traits = {
-      secrets = {
-        enable = true;
-        secretsDir = inputs.self + "/secrets/personal";
-      };
-    };
   };
 }
diff --git a/modules/nixos/profiles/server.nix b/modules/nixos/profiles/server.nix
index 8934863..09d1076 100644
--- a/modules/nixos/profiles/server.nix
+++ b/modules/nixos/profiles/server.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   secretsDir,
+  inputs,
   inputs',
   ...
 }:
@@ -23,8 +24,12 @@ in
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       {
-        # All servers are most likely on stable, so we want to pull in some newer packages from time to time
-        _module.args.unstable = inputs'.nixpkgs.legacyPackages;
+        _module.args = {
+          # All servers are most likely on stable, so we want to pull in some newer packages from time to time
+          unstable = inputs'.nixpkgs.legacyPackages;
+
+          secretsDir = inputs.self + "/secrets/${config.networking.hostName}";
+        };
 
         age.secrets = {
           tailscaleAuthKey.file = "${secretsDir}/tailscaleAuthKey.age";
@@ -61,10 +66,6 @@ in
           };
         };
 
-        traits = {
-          secrets.enable = true;
-        };
-
         # I use exclusively Tailscale auth on some machines
         users.allowNoPasswordLogin = true;