From b3e64616fabd289edd8f52b216d3ac5f388879ec Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Tue, 14 Apr 2015 09:30:49 +0200
Subject: .zsh.after/export.zsh: Re-add keychain functionality for.. Debian.

---
 .zsh.after/export.zsh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to '.zsh.after/export.zsh')

diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh
index a602d79..5b485de 100644
--- a/.zsh.after/export.zsh
+++ b/.zsh.after/export.zsh
@@ -31,15 +31,18 @@ _JAVA_AWT_WM_NONREPARENTING=1; export _JAVA_AWT_WM_NONREPARENTING
 # GnuPG
 export GPG_TTY=$(tty)
 
-# ssh-agent setting for use with gpg-agent
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-  export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh"
+if [[ "$(uname -v)" != *Debian* ]]; then
+  # ssh-agent setting for use with gpg-agent
+  unset SSH_AGENT_PID
+  if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh"
+  fi
+  # Explicitely starting gpg-agent in the background
+  gpgconf --launch gpg-agent
+else
+  eval $(keychain --eval --agents gpg,ssh -Q --quiet ~/.ssh/id_rsa)
 fi
 
-# Explicitely starting gpg-agent in the background
-gpgconf --launch gpg-agent
-
 if [[ $UID -ne 0 ]]; then
   export TMUX_TMPDIR="/run/user/$UID/tmux/"
 fi
-- 
cgit v1.2.3-70-g09d2