From f7c25419b7c83b5886af9b9a1670ffb1a6b22288 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 15 Nov 2016 13:11:22 +0000
Subject: [PATCH] Use gpg-agent for ssh-agent duties

---
 bash/.bash_profile |  4 ----
 bash/.bashrc       | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bash/.bash_profile b/bash/.bash_profile
index 6b6f965..d1982c4 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -14,7 +14,3 @@ if [ -f /etc/bash_completion ]; then
 fi
 
 export TMPDIR="/home/max/.local/tmp"
-
-gpg-agent --daemon
-
-export GPG_AGENT_INFO="${GNUPGHOME:-${HOME}/.gnupg}/S.gpg-agent:-1:1"
diff --git a/bash/.bashrc b/bash/.bashrc
index a90c177..8d4422e 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,13 +123,17 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
-
-if [ -f "${HOME}/.gpg-agent-info" ]; then
-  . "${HOME}/.gpg-agent-info"
-  export GPG_AGENT_INFO
-  export SSH_AUTH_SOCK
+if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
+    gpg-connect-agent /bye >/dev/null 2>&1
 fi
 
-
-# Set GPG TTY
+export GPG_AGENT_INFO="${GNUPGHOME:-${HOME}/.gnupg}/S.gpg-agent:-1:1"
 export GPG_TTY=$(tty)
+
+# Use gpg-agent for SSH
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+fi
+
+gpg-connect-agent udatestartuptty /bye >/dev/null
-- 
2.46.2