2012-10-16 10:17:25 +02:00
|
|
|
#!/bin/bash
|
2012-10-07 15:16:58 +02:00
|
|
|
xmodmap ~/.Xmodmap
|
|
|
|
|
|
2012-10-17 08:48:46 +02:00
|
|
|
<<<<<<< HEAD
|
2012-10-12 08:46:14 +02:00
|
|
|
emacs --daemon &
|
2012-10-17 08:48:46 +02:00
|
|
|
=======
|
2012-10-16 10:17:25 +02:00
|
|
|
# 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
|
|
|
|
|
|
2012-10-07 15:16:58 +02:00
|
|
|
{ emacs --daemon & } && sleep 1
|
2012-10-17 08:48:46 +02:00
|
|
|
>>>>>>> origin/master
|
2012-10-07 15:16:58 +02:00
|
|
|
|
|
|
|
|
pidof mpdscribble >& /dev/null
|
|
|
|
|
if [ $? -ne 0 ]
|
|
|
|
|
then
|
|
|
|
|
mpdscribble &
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\""
|
2012-10-10 09:11:32 +02:00
|
|
|
exec $wm
|
