From 8f0c21a828f9f2b854f5850b454a3b0b76476493 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 16 Jul 2015 19:29:03 +0200
Subject: Moved urxvtd back into xmonad; Fixed spawnKeychain in xmonad

---
 .config/systemd/user/urxvtd.service | 10 ----------
 .xmonad/xmonad.hs                   | 11 ++++++++---
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 .config/systemd/user/urxvtd.service

diff --git a/.config/systemd/user/urxvtd.service b/.config/systemd/user/urxvtd.service
deleted file mode 100644
index c5ff9b9..0000000
--- a/.config/systemd/user/urxvtd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=urxvtd - urxvt terminal daemon
-
-[Service]
-Type=simple
-ExecStart=/bin/sh -c urxvtd
-Restart=always
-
-[Install]
-WantedBy=default.target
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 35112a5..621d1e1 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -40,6 +40,9 @@ import Control.Monad (when)
 import Graphics.X11.ExtraTypes.XF86
 import XMonad.Util.Cursor
 import XMonad.Actions.Warp
+import XMonad.Util.SpawnOnce
+import System.Directory
+import System.FilePath
 
 import XMonad.Layout.IM
 
@@ -164,11 +167,13 @@ main = do
   xmonad $ myConfig
   
 autostart = [ spawnKeychain
+            , spawnOnce "urxvtd -o"
             ]
 
-spawnKeychain = safeSpawn "urxvt" $ ["-e", "keychain"] ++ keys
-  where
-    keys = map ("~/.ssh/id_" ++) ["ed25519", "ecdsa", "rsa"]
+spawnKeychain = do
+  home <- liftIO getHomeDirectory
+  let keys = map ((home </>) . ("/.ssh/id_" ++)) ["ed25519", "ecdsa", "rsa"]
+  safeSpawn "urxvt" $ ["-e", "keychain"] ++ keys
 
 assimilateKeychain :: X ()
 assimilateKeychain = liftIO $ assimilateKeychain' >> return ()
-- 
cgit v1.2.3