diff options
| author |  Tom Willemsen | 2013-02-15 15:37:42 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-02-15 15:37:42 +0100 |
| commit | 934d02bcacaa5d0aef64a8edf7677f3b0c198666 (patch) | |
| tree | edfc842025b5f8569973567b44ad62aa662f548f /.xinitrc | |
| parent | 06ff316f7f3b098504a6342651a79017cfb80ae7 (diff) | |
| parent | ee34dfcc2c2fec53731b64afca03bb34dd80b2ba (diff) | |
| download | dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.tar.gz dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/awesome/rc.lua
.emacs.d/init.el
.emacs.d/init.org
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.xinitrc')
| -rwxr-xr-x | .xinitrc | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -9,8 +9,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi -emacs --daemon & -fehlstart & +xflux -l 51.1180 -g 4.0012 +unclutter & +mowedline & +xcompmgr -n -r 0 & +feh --bg-tile ~/pictures/wallpapers/wallpaper-864137.jpg -test -n "$1" && wm=$1 || wm="sawfish" +test -n "$1" && wm=$1 || wm="xmonad" exec $wm |