diff options
| author |  Tom Willemsen | 2012-10-17 08:48:46 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-17 08:48:46 +0200 |
| commit | 821793e7deba56da5932ed42957ffefbe140ce22 (patch) | |
| tree | 5ee090c9d1e3e0793d79f5790d53141a20f12912 /.xinitrc | |
| parent | 862088a69158e2f8f2b6b6b7054c73bae6c40b4c (diff) | |
| parent | b74622f11bacbb696f3cba17f399b0ea77f76dbd (diff) | |
| download | dotfiles-821793e7deba56da5932ed42957ffefbe140ce22.tar.gz dotfiles-821793e7deba56da5932ed42957ffefbe140ce22.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.xinitrc
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 |