From aa0a73ff164ec924ae994564f1975027413db4bc Mon Sep 17 00:00:00 2001
From: Jens Sauer <jsauer65@gmail.com>
Date: Fri, 4 Dec 2020 11:19:09 +0100
Subject: [PATCH 1/2] gnupg: Enable SSH support for gpg-agent

This enables the ssh agent compatability of gpg-agent.
---
 gnupg/.gnupg/gpg-agent.conf | 1 +
 shell/.profile              | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf
index ec4d895..09cf732 100644
--- a/gnupg/.gnupg/gpg-agent.conf
+++ b/gnupg/.gnupg/gpg-agent.conf
@@ -1,3 +1,4 @@
 default-cache-ttl 14400
 max-cache-ttl 14400
 pinentry-program /usr/bin/pinentry-gnome3
+enable-ssh-support
diff --git a/shell/.profile b/shell/.profile
index 15a3d29..8f92d5c 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -30,3 +30,10 @@ fi
 
 export VISUAL=vim
 export EDITOR="$VISUAL"
+
+export GPG_TTY=$(tty)
+
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi

From 3d613ee9abe31c394dbdd54e95d59b4d90c331aa Mon Sep 17 00:00:00 2001
From: Jens Sauer <jsauer65@gmail.com>
Date: Fri, 4 Dec 2020 11:20:43 +0100
Subject: [PATCH 2/2] gnupg: Use system provided /usr/bin/pinentry

Use system provided pinentry instead of a fixed version -gnome3 etc.
---
 gnupg/.gnupg/gpg-agent.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf
index 09cf732..c635b0d 100644
--- a/gnupg/.gnupg/gpg-agent.conf
+++ b/gnupg/.gnupg/gpg-agent.conf
@@ -1,4 +1,3 @@
 default-cache-ttl 14400
 max-cache-ttl 14400
-pinentry-program /usr/bin/pinentry-gnome3
 enable-ssh-support