From ef7339743ea8e5c8244f0ae55b4f06a2ce0dd4d4 Mon Sep 17 00:00:00 2001
From: shokinn <mail@philip-henning.com>
Date: Wed, 1 Nov 2023 19:23:48 +0100
Subject: [PATCH] add gpg agent config fot tty passphrase entry

---
 config.yaml                   |  4 ++++
 dotfiles/gnupg/gpg-agent.conf |  5 +++++
 dotfiles/zshenv               | 16 ++++++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 dotfiles/gnupg/gpg-agent.conf

diff --git a/config.yaml b/config.yaml
index 73bbf66..bd786c3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -131,6 +131,9 @@ dotfiles:
   f_commonfunc:
     dst: ~/.commonfunc
     src: commonfunc
+  f_gpgagent:
+    dst: ~/.gnupg/gpg-agent.conf
+    src: gnupg/gpg-agent.conf
 profiles:
   AINCRAD:
     dotfiles:
@@ -252,6 +255,7 @@ profiles:
     - f_wslenablehypervforwarding
     - f_wslshowhypervforwarding
     - f_commonfunc
+    - f_gpgagent
   workspace:
     dotfiles:
     - d_fonts
diff --git a/dotfiles/gnupg/gpg-agent.conf b/dotfiles/gnupg/gpg-agent.conf
new file mode 100644
index 0000000..820b627
--- /dev/null
+++ b/dotfiles/gnupg/gpg-agent.conf
@@ -0,0 +1,5 @@
+#
+# {{@@ header() @@}}
+#
+
+pinentry-program /usr/bin/pinentry-tty
diff --git a/dotfiles/zshenv b/dotfiles/zshenv
index 75cba33..dd37447 100644
--- a/dotfiles/zshenv
+++ b/dotfiles/zshenv
@@ -30,14 +30,18 @@ if [ $? -ne 0 ]; then
   (setsid nohup socat UNIX-LISTEN:$SSH_AUTH_SOCK,fork EXEC:{{@@ env['HOME'] @@}}/.ssh/wsl2-ssh-pageant.exe >/dev/null 2>&1 &)
 fi
 
+# Currently not used
 # Connect to windows gpg agent
 # https://github.com/BlackReloaded/wsl2-ssh-pageant
-export GPG_AGENT_SOCK={{@@ env['HOME'] @@}}/.gnupg/S.gpg-agent
-ss -a | grep -q $GPG_AGENT_SOCK
-if [ $? -ne 0 ]; then
-  rm -rf $GPG_AGENT_SOCK
-  (setsid nohup socat UNIX-LISTEN:$GPG_AGENT_SOCK,fork EXEC:"{{@@ env['HOME'] @@}}/.ssh/wsl2-ssh-pageant.exe --gpg S.gpg-agent" >/dev/null 2>&1 &)
-fi
+# export GPG_AGENT_SOCK={{@@ env['HOME'] @@}}/.gnupg/S.gpg-agent
+# ss -a | grep -q $GPG_AGENT_SOCK
+# if [ $? -ne 0 ]; then
+#   rm -rf $GPG_AGENT_SOCK
+#   (setsid nohup socat UNIX-LISTEN:$GPG_AGENT_SOCK,fork EXEC:"{{@@ env['HOME'] @@}}/.ssh/wsl2-ssh-pageant.exe --gpg S.gpg-agent" >/dev/null 2>&1 &)
+# fi
+
+# Set GPG_TTY to enable passphrase entry via tty
+export GPG_TTY=$(tty)
 
 # X410 (Windows X11 Server)
 export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):0.0