diff options
| author |  Tom Willemsen | 2012-10-07 15:23:23 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-07 15:23:23 +0200 |
| commit | 52abe4f88168002420813e20751d772023d96718 (patch) | |
| tree | d87aeefe7ca798fd8cdb911d932a2712944f5ca3 /.xinitrc | |
| parent | 5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d (diff) | |
| parent | 049a44b608aacbaf1f040183def77fd7e7243fe3 (diff) | |
| download | dotfiles-52abe4f88168002420813e20751d772023d96718.tar.gz dotfiles-52abe4f88168002420813e20751d772023d96718.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.config/awesome/rc.lua
Diffstat (limited to '.xinitrc')
| -rw-r--r-- | .xinitrc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/.xinitrc b/.xinitrc new file mode 100644 index 0000000..0e41d5d --- /dev/null +++ b/.xinitrc @@ -0,0 +1,15 @@ + +xmodmap ~/.Xmodmap + +{ emacs --daemon & } && sleep 1 + +pidof mpdscribble >& /dev/null +if [ $? -ne 0 ] +then + mpdscribble & +fi + +# rox -b Default + +test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\"" +exec ck-launch-session $wm |