From c30fc0cef3b47db8e552ff5ed3221e8d9170f777 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Mon, 23 Apr 2018 15:17:48 +0200
Subject: [PATCH] More portable ssh-agent config.

---
 zsh/.config/zsh/.zshenv | 10 ++++++++++
 zsh/.config/zsh/.zshrc  |  6 ------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
index 5022e7d..211d62b 100644
--- a/zsh/.config/zsh/.zshenv
+++ b/zsh/.config/zsh/.zshenv
@@ -105,3 +105,13 @@ export RANDFILE=$XDG_RUNTIME_DIR/rnd
 export NODE_REPL_HISTORY="$XDG_CACHE_HOME/node_repl_history"
 export MYSQL_HISTFILE="$XDG_CACHE_HOME/mysql_history"
 export PSQL_HISTORY="$XDG_CACHE_HOME/psql_history"
+
+# Make sure a keyring is available
+if [[ -z $SSH_AUTH_SOCK ]]; then
+	if [[ -n $DESKTOP_SESSION ]] && type gnome-keyring-daemon &> /dev/null; then
+		eval $(gnome-keyring-daemon --start)
+		export SSH_AUTH_SOCK
+	elif type ssh-agent &> /dev/null; then
+		eval $(ssh-agent)
+	fi
+fi
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index a7b4168..44d5ae2 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -165,9 +165,3 @@ preexec ()
 		print -Pn "\e]0;$1\a"
 	fi
 }
-
-# Make gnome-keyring available
-if [[ -z $SSH_AUTH_SOCK ]] && type gnome-keyring-daemon &> /dev/null; then
-	eval $(gnome-keyring-daemon --start)
-	export SSH_AUTH_SOCK
-fi