From 9d957ab52aea14302e313f1494d5bc9942ff3def Mon Sep 17 00:00:00 2001
From: Ryan <ryan@andthensome.nl>
Date: Fri, 30 Dec 2016 21:07:59 +0100
Subject: [PATCH] added gpg stuff

---
 gnupg/.pam_environment | 1 +
 oh-my-zsh/.oh-my-zsh   | 2 +-
 zsh/.zshrc             | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnupg/.pam_environment b/gnupg/.pam_environment
index a23772b..b55fba7 100644
--- a/gnupg/.pam_environment
+++ b/gnupg/.pam_environment
@@ -1 +1,2 @@
+SSH_AGENT_PID	DEFAULT=
 SSH_AUTH_SOCK	DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
diff --git a/oh-my-zsh/.oh-my-zsh b/oh-my-zsh/.oh-my-zsh
index 67dad45..ff5629e 160000
--- a/oh-my-zsh/.oh-my-zsh
+++ b/oh-my-zsh/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit 67dad45b38b7f0bafcaf7679da6eb4596301843b
+Subproject commit ff5629e60b815b3c21ef216d5ba5943932589758
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 782b9fd..b95636c 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -85,4 +85,10 @@ source $ZSH/oh-my-zsh.sh
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 #
 
+# Set GPG TTY
+export GPG_TTY=$(tty)
+
+# Refresh gpg-agent tty in case user switches into an X session
+gpg-connect-agent updatestartuptty /bye >/dev/null
+
 neofetch