pam environment is depreciated

3 files changed, 5 insertions, 5 deletions

diff --git a/.pam_environment b/.pam_environment
deleted file mode 100644
index b55fba7..0000000
--- a/.pam_environment
+++ /dev/null
@@ -1,2 +0,0 @@
-SSH_AGENT_PID	DEFAULT=
-SSH_AUTH_SOCK	DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
diff --git a/.zshrc b/.zshrc
index ce58bdd..bc999f0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -80,5 +80,10 @@ zstyle ':vcs_info:git:*' formats '|%F{3}%b%f'
 
 gpg-connect-agent updatestartuptty /bye > /dev/null
 
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+  export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi
+
 setopt PROMPT_SUBST
 PROMPT='<%F{2}%n%f@%F{6}%m%f|%F{5}%~%f${vcs_info_msg_0_}%f> '
diff --git a/build b/build
index fb83c4e..08b7b94 100755
--- a/build
+++ b/build
@@ -88,9 +88,6 @@ ln -s "$RC_DIR/.config/calcurse" "$HOME/.config/"
 # xscreensaver setup
 ln -s "$RC_DIR/.xscreensaver" "$HOME"
 
-# pam setup
-ln -s "$RC_DIR/.pam_environment" "$HOME"
-
 # gpg setup
 mkdir -p "$HOME/.gnupg"
 ln -s "$RC_DIR/.gnupg/gpg-agent.conf" "$HOME/.gnupg/"