Revert removal of xinitrc and cleanup

config/systemd/user/default.target.wants/dunst.service

@@ -1 +0,0 @@
-/home/felix/dotfiles/config/systemd/user/dunst.service

config/systemd/user/default.target.wants/feh.service

@@ -1 +0,0 @@
-/home/felix/dotfiles/config/systemd/user/feh.service

config/systemd/user/default.target.wants/redshift.service

@@ -1 +0,0 @@
-/home/felix/dotfiles/config/systemd/user/redshift.service

config/systemd/user/default.target.wants/xautolock.service

@@ -1 +0,0 @@
-/home/felix/dotfiles/config/systemd/user/xautolock.service

config/systemd/user/default.target.wants/xcape.service

@@ -1 +0,0 @@
-/home/felix/dotfiles/config/systemd/user/xcape.service

config/systemd/user/default.target.wants/xset.service

@@ -1 +0,0 @@
-/home/felix/dotfiles/config/systemd/user/xset.service

config/systemd/user/dunst.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Dunst Notification Daemon
-After=display-manager.service
-Wants=display-manager.service
-
-[Service]
-ExecStart=/usr/bin/dunst
-
-[Install]
-WantedBy=default.target

config/systemd/user/feh.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Feh Background Image Loader
-After=display-manager.service
-Wants=display-manager.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/feh --bg-scale '/home/felix/Pictures/lain.png'
-
-[Install]
-WantedBy=default.target

config/systemd/user/redshift.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Redshift
-After=display-manager.service
-Wants=display-manager.service
-
-[Service]
-ExecStart=/usr/bin/redshift
-
-[Install]
-WantedBy=default.target

config/systemd/user/xautolock.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=X Autolocker
-After=display-manager.service
-Wants=display-manager.service
-
-[Service]
-ExecStart=/usr/bin/xautolock -time 1 -locker xsecurelock
-
-[Install]
-WantedBy=default.target

config/systemd/user/xcape.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=XCape Modifier Key Modifier
-After=display-manager.service
-Wants=display-manager.service
-
-[Service]
-ExecStart=/usr/bin/xcape -d -t 100 -e 'Super_L=Scroll_Lock;Shift_L=Escape'
-
-[Install]
-WantedBy=default.target

config/systemd/user/xset.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Set screen timeout properties
-After=display-manager.service
-Wants=display-manager.service
-
-[Service]
-ExecStart=/usr/bin/xset dpms 0 0 50 s off
-
-[Install]
-WantedBy=default.target

xinitrc

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+# Forking graphical programs
+forklog() {
+    nohup $* | logger &
+}
+
+forklog redshift
+forklog dunst
+forklog xcape -t 100 -e 'Super_L=Scroll_Lock;Shift_L=Escape'
+forklog feh  --bg-scale '/home/felix/Pictures/lain.png'
+forklog xautolock -time 1 -locker xsecurelock &
+forklog xset dpms 0 0 50 s off &
+
+# Start herbstluftwm in locked mode. Is unlocked after autostart.
+exec xmonad

xmonad/xmonad.hs

@@ -37,7 +37,10 @@ myTerminal :: [Char]
 myTerminal = "urxvtc"
 
 runInTerminal :: [Char] -> [Char] -> [Char]
-runInTerminal e n = myTerminal ++ " -name " ++ n ++ " -e " ++ e ++ " > /dev/null 2>&1"
+runInTerminal e n = myTerminal ++ " -name " ++ n ++ " -e " ++ e
+
+logged :: [Char] -> [Char]
+logged m = "nohup " ++ m ++ " | logger"
 
 -- Whether focus follows the mouse pointer.
 myFocusFollowsMouse :: Bool
@@ -119,7 +122,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     [ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf)
 
     -- launch dmenu
-    , ((0,                  xK_Scroll_Lock), spawn "PATH=\"/home/felix/.local/bin:$PATH\" dmenu_run")
+    , ((0,                  xK_Scroll_Lock), spawn $ logged "dmenu_run")
 
     -- close focused window
     , ((modm .|. shiftMask, xK_c     ), kill)