diff --git a/.config/environment.d/99-gpg-agent_ssh.conf b/.config/environment.d/99-gpg-agent_ssh.conf
new file mode 100644
index 0000000..1fd2fba
--- /dev/null
+++ b/.config/environment.d/99-gpg-agent_ssh.conf
@@ -0,0 +1 @@
+SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
new file mode 100644
index 0000000..5d19d34
--- /dev/null
+++ b/.gnupg/gpg-agent.conf
@@ -0,0 +1 @@
+pinentry-program /usr/bin/pinentry-gnome3