ryuslash/legacy-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

.xinitrc

Browse source
This commit is contained in:
Tom Willemsen 2012-10-17 20:32:50 +02:00
parent 5c4c72f56f
commit ab3e4c680e
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.xinitrc
View file

@ -1,9 +1,6 @@
#!/bin/bash #!/bin/bash
xmodmap ~/.Xmodmap xmodmap ~/.Xmodmap
<<<<<<< HEAD
emacs --daemon &
=======
# Source scripts in /etc/X11/xinit/xinitrc.d/ # Source scripts in /etc/X11/xinit/xinitrc.d/
if [ -d /etc/X11/xinit/xinitrc.d ]; then if [ -d /etc/X11/xinit/xinitrc.d ]; then
for f in /etc/X11/xinit/xinitrc.d/*; do for f in /etc/X11/xinit/xinitrc.d/*; do
@ -12,8 +9,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
unset f unset f
fi fi
{ emacs --daemon & } && sleep 1 emacs --daemon &
>>>>>>> origin/master
pidof mpdscribble >& /dev/null pidof mpdscribble >& /dev/null
if [ $? -ne 0 ] if [ $? -ne 0 ]