This commit is contained in:
Tom Willemsen 2012-10-16 10:17:25 +02:00
parent aaf6d4a717
commit 567b4a61ef

12
.xinitrc Normal file → Executable file
View file

@ -1,6 +1,14 @@
#!/bin/bash
xmodmap ~/.Xmodmap 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 { emacs --daemon & } && sleep 1
pidof mpdscribble >& /dev/null pidof mpdscribble >& /dev/null
@ -9,7 +17,5 @@ then
mpdscribble & mpdscribble &
fi fi
# rox -b Default
test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\"" test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\""
exec $wm exec $wm