From 8ce282feac3d2d585a77752f8914371356621a98 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@gmail.com>
Date: Tue, 9 Dec 2014 21:59:02 +0100
Subject: [PATCH] add xinitrc

---
 fetch_them_files.sh |  2 +-
 xinitrc             | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 xinitrc

diff --git a/fetch_them_files.sh b/fetch_them_files.sh
index 8f4a6e7..f182a43 100644
--- a/fetch_them_files.sh
+++ b/fetch_them_files.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-files="$(ls ~/.vimrc ~/.Xresources ~/.zshrc)"
+files="$(ls ~/.vimrc ~/.Xresources ~/.zshrc ~/.xinitrc)"
 
 echo "$files" | while read file; do
     cp "$file" "${file##*/.}"
diff --git a/xinitrc b/xinitrc
new file mode 100644
index 0000000..5150bc1
--- /dev/null
+++ b/xinitrc
@@ -0,0 +1,44 @@
+#!/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
+
+# For now, start stuff here
+urxvtd &
+redshift &
+dunst &
+# screen locking
+xset dpms 0 0 50 &
+xset s off &
+xautolock -time 1 -locker slock &
+
+# Start herbstluftwm in locked mode. Is unlocked after autostart.
+exec herbstluftwm --locked