diff options
Diffstat (limited to '.xinitrc')
| -rwxr-xr-x[-rw-r--r--] | .xinitrc | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -1,7 +1,19 @@ - +#!/bin/bash xmodmap ~/.Xmodmap +<<<<<<< HEAD emacs --daemon & +======= +# 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 +>>>>>>> origin/master pidof mpdscribble >& /dev/null if [ $? -ne 0 ] @@ -9,7 +21,5 @@ then mpdscribble & fi -# rox -b Default - test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\"" exec $wm |