From bb271dca9da2f0941c2a30625d810054335d6af6 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpitchakladar+git@gmail.com>
Date: Wed, 2 Sep 2026 04:00:48 +0530
Subject: chore(security/gopass): minor change to gopass-ssh-load script
 derivation

---
 modules/security/gopass/default.nix        | 16 +++++++++++-----
 modules/security/gopass/gopass-ssh-load.sh |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'modules/security/gopass')

diff --git a/modules/security/gopass/default.nix b/modules/security/gopass/default.nix
index fa5e486..70f101f 100644
--- a/modules/security/gopass/default.nix
+++ b/modules/security/gopass/default.nix
@@ -16,11 +16,17 @@ let
       openssh
       bash
     ];
-    text = ''
-      export GNUPGHOME="${config.home.sessionVariables.GNUPGHOME}"
-      export GOPASS_SSH_KEYS="${lib.concatStringsSep " " gopassKeys}"
-      ${builtins.readFile ./gopass-ssh-load.sh}
-    '';
+    text =
+      builtins.replaceStrings
+        [
+          "@@GOPASS_SSH_KEYS@@"
+          "@@GNUPGHOME@@"
+        ]
+        [
+          (lib.concatStringsSep " " gopassKeys)
+          config.home.sessionVariables.GNUPGHOME
+        ]
+        (builtins.readFile ./gopass-ssh-load.sh);
   };
 in
 {
diff --git a/modules/security/gopass/gopass-ssh-load.sh b/modules/security/gopass/gopass-ssh-load.sh
index c6b9a29..e974713 100644
--- a/modules/security/gopass/gopass-ssh-load.sh
+++ b/modules/security/gopass/gopass-ssh-load.sh
@@ -4,7 +4,8 @@ set -o nounset
 set -o pipefail
 
 # Load SSH keys from gopass password store
-export GNUPGHOME="${GNUPGHOME:-$HOME/.local/share/gnupg}"
+export GNUPGHOME="@@GNUPGHOME@@"
+export GOPASS_SSH_KEYS="@@GOPASS_SSH_KEYS@@"
 
 SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 export SSH_AUTH_SOCK
-- 
cgit v1.2.3


From b2e34bad67147e8fde874c7c014b65c81fa2f361 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpitchakladar+git@gmail.com>
Date: Wed, 2 Sep 2026 15:41:00 +0530
Subject: feat(security/gopass): added git configuration for gopass upstream
 repo

---
 modules/security/gopass/default.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'modules/security/gopass')

diff --git a/modules/security/gopass/default.nix b/modules/security/gopass/default.nix
index 70f101f..4d223e9 100644
--- a/modules/security/gopass/default.nix
+++ b/modules/security/gopass/default.nix
@@ -59,6 +59,26 @@ in
         };
       };
 
+      # use a different username and email to show these commits are auto
+      # generated by gopass
+      programs.git.includes = lib.mkIf config.development.git.enable [
+        {
+          condition = "gitdir:${config.programs.password-store.settings.PASSWORD_STORE_DIR}/";
+          contents = {
+            user = {
+              name = "Gopass of ${config.home.username}";
+              email = "${config.home.username}@gopass.localhost";
+            };
+            commit = {
+              gpgSign = false;
+            };
+            tag = {
+              gpgSign = false;
+            };
+          };
+        }
+      ];
+
       home.sessionVariables = {
         PASSWORD_STORE_DIR = config.programs.password-store.settings.PASSWORD_STORE_DIR;
       };
-- 
cgit v1.2.3