From 64b98818337eaa0b31902a12875330298e8e49a9 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <maximilian.friedersdorff@envsys.co.uk>
Date: Wed, 26 Oct 2022 12:33:02 +0100
Subject: [PATCH] Use gpg agent as ssh agent again

---
 states/zsh/files/zshenv | 3 +++
 states/zsh/files/zshrc  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/states/zsh/files/zshenv b/states/zsh/files/zshenv
index ab80266..f36b7d0 100644
--- a/states/zsh/files/zshenv
+++ b/states/zsh/files/zshenv
@@ -32,3 +32,6 @@ export GPG_TTY=$(tty)
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
+
+unset SSH_AGENT_PID
+export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 458a576..2e44d7f 100644
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -86,3 +86,6 @@ chpwd() {
         fi
     fi
 }
+
+export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null
-- 
2.46.2