From cd95c17979f1dd4b49a6a1ded60e4c8049b583a9 Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@snaile.de>
Date: Thu, 1 Jun 2023 12:38:34 +0200
Subject: [PATCH] gpg fixes

---
 .config/X11/xsession.d/60gpg-agent | 8 --------
 .config/zsh/.zshrc                 | 2 ++
 .config/zsh/configs/setup          | 1 -
 .config/zsh/profile                | 6 ++++++
 .local/share/gnupg/gpg-agent.conf  | 2 ++
 5 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100755 .config/X11/xsession.d/60gpg-agent
 create mode 100644 .local/share/gnupg/gpg-agent.conf

diff --git a/.config/X11/xsession.d/60gpg-agent b/.config/X11/xsession.d/60gpg-agent
deleted file mode 100755
index bac228ef..00000000
--- a/.config/X11/xsession.d/60gpg-agent
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "${SSH_AUTH_SOCK:-0}" -ne $$ ]; then
-    sock="$(gpgconf --list-dirs agent-ssh-socket)"
-	export SSH_AUTH_SOCK=$sock
-fi
-export GPG_TTY="$TTY"
-gpg-connect-agent updatestartuptty /bye >/dev/null
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index c222636c..815306fd 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -14,3 +14,5 @@ for f in $ZDOTDIR/configs/autogenerated/*; do
     source $f
 done
 
+export GPG_TTY=$(tty)
+setsid -f gpg-connect-agent updatestartuptty /bye 1>/dev/null
diff --git a/.config/zsh/configs/setup b/.config/zsh/configs/setup
index 64d4f13d..a4b43020 100644
--- a/.config/zsh/configs/setup
+++ b/.config/zsh/configs/setup
@@ -27,4 +27,3 @@ preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt.
 whed() {
 	$EDITOR "$(which "$1")"
 }
-
diff --git a/.config/zsh/profile b/.config/zsh/profile
index 9ee95fbd..f1d3c220 100644
--- a/.config/zsh/profile
+++ b/.config/zsh/profile
@@ -93,6 +93,12 @@ export NVM_DIR="$HOME/.config/nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi
+gpgconf --launch gpg-agent
+
 if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
     exec startx
 fi
diff --git a/.local/share/gnupg/gpg-agent.conf b/.local/share/gnupg/gpg-agent.conf
new file mode 100644
index 00000000..4214acff
--- /dev/null
+++ b/.local/share/gnupg/gpg-agent.conf
@@ -0,0 +1,2 @@
+enable-ssh-support
+pinentry-program /usr/local/bin/pinentry-dmenu