blob: 8de9f49a92440dc7db551ad2da25447f8c0c78ed (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
#!/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 ]
then
mpdscribble &
fi
test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\""
exec $wm
|
