From 9be443814c1d6afe0e1bd585a6d3dbf12708a7e1 Mon Sep 17 00:00:00 2001
From: Loic Nageleisen <loic.nageleisen@gmail.com>
Date: Thu, 14 Aug 2014 09:29:51 +0200
Subject: [PATCH] linux tweaks

---
 home/Xresources | 2 +-
 shell/colors    | 1 +
 shell/ssh       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 shell/ssh

diff --git a/home/Xresources b/home/Xresources
index 6218c0c..5408ca2 100644
--- a/home/Xresources
+++ b/home/Xresources
@@ -58,7 +58,7 @@ xterm*multiScroll:        true
 xterm*toolBar:            false
 xterm*termName:           xterm-256color
 
-!xterm*loginShell:         true
+xterm*loginShell:         true
 
 ! Zenburn
 !xterm*scrollBar*background:  #3f3f3f
diff --git a/shell/colors b/shell/colors
index de2f4ea..e359504 100755
--- a/shell/colors
+++ b/shell/colors
@@ -5,3 +5,4 @@ export GREP_OPTIONS CLICOLOR
 
 # gnome terminal knows colors
 [[ "$COLORTERM" == "gnome-terminal" ]] && export TERM=xterm-256color
+[[ "$COLORTERM" == "xfce4-terminal" ]] && export TERM=xterm-256color
diff --git a/shell/ssh b/shell/ssh
old mode 100755
new mode 100644
index d02d41d..99735d2
--- a/shell/ssh
+++ b/shell/ssh
@@ -1,6 +1,6 @@
 # ssh keychain, if no agent set
 if [ -z "$SSH_AUTH_SOCK" ]; then
-    if which keychain 2>&1 >/dev/null; then
-        eval $(keychain --eval --agents ssh -Q --quiet id_rsa)
+    if which envoy 2>&1 >/dev/null; then
+        source <(envoy -p)
     fi
 fi