summaryrefslogtreecommitdiffstats
path: root/.xinitrc
diff options
context:
space:
mode:
Diffstat (limited to '.xinitrc')
-rwxr-xr-x[-rw-r--r--].xinitrc12
1 files changed, 9 insertions, 3 deletions
diff --git a/.xinitrc b/.xinitrc
index af2e551..d4a7db4 100644..100755
--- 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