Revert removal of xinitrc and cleanup

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