feat(sops): make secrets optional in homes

sbulav · Nov 8, 2024 · b9d71b5 · b9d71b5
1 parent bda4b05
commit b9d71b5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/nix/homes/aarch64-darwin/sab@mbp16/default.nix b/nix/homes/aarch64-darwin/sab@mbp16/default.nix
@@ -44,6 +44,12 @@ with lib.custom; {
     };
   };
 
+  sops.secrets = {
+    env_credentials = {
+      sopsFile = lib.snowfall.fs.get-file "secrets/sab/default.yaml";
+      path = "${config.home.homeDirectory}/.ssh/sops-env-credentials";
+    };
+  };
   home.sessionPath = [
     "$HOME/bin"
   ];

diff --git a/nix/homes/x86_64-linux/sab@nz/default.nix b/nix/homes/x86_64-linux/sab@nz/default.nix
@@ -63,5 +63,12 @@ in {
       };
     };
   };
+
+  sops.secrets = {
+    env_credentials = {
+      sopsFile = lib.snowfall.fs.get-file "secrets/sab/default.yaml";
+      path = "${config.home.homeDirectory}/.ssh/sops-env-credentials";
+    };
+  };
   home.stateVersion = "23.11";
 }
diff --git a/nix/modules/home/security/sops/default.nix b/nix/modules/home/security/sops/default.nix
@@ -37,13 +37,6 @@ in {
         sshKeyPaths = ["${config.home.homeDirectory}/.ssh/id_ed25519"] ++ cfg.sshKeyPaths;
       };
 
-      # Example secrets
-      secrets = {
-        env_credentials = {
-          sopsFile = lib.snowfall.fs.get-file "secrets/sab/default.yaml";
-          path = "${config.home.homeDirectory}/.ssh/sops-env-credentials";
-        };
-      };
       #   exa_mbp16 = {
       #     sopsFile = lib.snowfall.fs.get-file "secrets/mbp16@sab/default.yaml";
       #     path = "${config.home.homeDirectory}/exa-test.yaml";

diff --git a/nix/modules/nixos/system/security/sops/default.nix b/nix/modules/nixos/system/security/sops/default.nix
@@ -24,11 +24,5 @@ in {
         keyFile = "${config.users.users.${config.${namespace}.user.name}.home}/.config/sops/age/keys.txt";
       };
     };
-
-    sops.secrets = {
-      "nz_sab_ssh_key" = {
-        sopsFile = lib.snowfall.fs.get-file "secrets/sab/default.yaml";
-      };
-    };
   };
 }