1 files changed, 11 insertions, 2 deletions
diff --git a/xinitrc b/xinitrc
index 157a17b..25e91d0 100755
--- a/xinitrc
+++ b/xinitrc
@@ -69,12 +69,21 @@ xsetroot -cursor_name left_ptr
 
 # {{{ Autostart settings
 #
-# Start the GnuPG agent and enable OpenSSH agent emulation
+# Start the GnuPG agent but don't enable OpenSSH agent emulation
 if (pgrep -u "${USER}" gpg-agent); then
   eval `cat ${gnupglog}`
   eval `cut -d= -f1 ${gnupglog} | xargs echo export`
 else
-  eval `gpg-agent --enable-ssh-support --daemon`
+  #eval `gpg-agent --enable-ssh-support --daemon`
+  eval  `gpg-agent --daemon`
+fi
+
+# Start the SSH-Agent to replace broken GnuPG agent
+if (pgrep -u "${USER}" ssh-agent); then
+  eval `cat ${HOME}/.keychain/${HOSTNAME}-sh`
+else
+  eval `ssh-agent`
+  (sleep 15 && keychain -q --timeout 480 --agents ssh id_rsa_sysphere id_rsa_heroin)&
 fi
 
 # Start the GNU Emacs daemon