From b77ceefb59bff16d29d6391491cc038e5ab8dcd4 Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Wed, 3 Aug 2016 07:52:38 +1200
Subject: [PATCH] Revert to XFCE4 and autostart: ssh-agent, gnome keyring
 daemon & urxvtd

---
 xfce4/xinitrc | 8 ++++++++
 zsh/zlogin    | 2 +-
 zsh/zshrc     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xfce4/xinitrc b/xfce4/xinitrc
index 680cccd..d702c0f 100644
--- a/xfce4/xinitrc
+++ b/xfce4/xinitrc
@@ -15,4 +15,12 @@ fi
 xscreensaver &
 xsetroot -cursor_name left_ptr &
 
+# Gnome Keyring Daemon
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
+
+# URXVTD Daemon
+[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+urxvtd -q -f -o
+
 exec startxfce4
diff --git a/zsh/zlogin b/zsh/zlogin
index 55ffd22..70b7059 100644
--- a/zsh/zlogin
+++ b/zsh/zlogin
@@ -1 +1 @@
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec sway
+[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
diff --git a/zsh/zshrc b/zsh/zshrc
index 0b0eb45..7b0c9bb 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -5,7 +5,7 @@ export ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="ys"
 
 # Plugins
-plugins=(archlinux common-aliases git sudo web-search)
+plugins=(archlinux common-aliases git sudo web-search ssh-agent)
 # look into node/npm
 
 # ZSH-Completions