From 567b4a61efff68eec16918393a75eb5a23794306 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Tue, 16 Oct 2012 10:17:25 +0200
Subject: .xinitrc

---
 .xinitrc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 .xinitrc

(limited to '.xinitrc')

diff --git a/.xinitrc b/.xinitrc
old mode 100644
new mode 100755
index af2e551..d4a7db4
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,14 @@
-
+#!/bin/bash
 xmodmap ~/.Xmodmap
 
+# Source scripts in /etc/X11/xinit/xinitrc.d/
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for f in /etc/X11/xinit/xinitrc.d/*; do
+        [ -x "$f" ] && . "$f"
+    done
+    unset f
+fi
+
 { emacs --daemon & } && sleep 1
 
 pidof mpdscribble >& /dev/null
@@ -9,7 +17,5 @@ then
     mpdscribble &
 fi
 
-# rox -b Default
-
 test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\""
 exec $wm
-- 
cgit v1.2.3-54-g00ecf