diff options
| author |  Tom Willemsen | 2012-06-17 21:28:28 +0000 |
|---|---|---|
| committer | Tom Willemsen | 2012-06-17 21:28:28 +0000 |
| commit | 69fd0e5aef2fd8d90449c6725f48b9b280be4cb5 (patch) | |
| tree | 74964497184a7bdc44bddc50f40931002f4fb2af /.xinitrc | |
| parent | f3982b8c335f1888cb14fd9578031fd9690626e6 (diff) | |
| parent | 243c6fe77a04457a16afff3dc3e000f989f7bcc1 (diff) | |
| download | dotfiles-69fd0e5aef2fd8d90449c6725f48b9b280be4cb5.tar.gz dotfiles-69fd0e5aef2fd8d90449c6725f48b9b280be4cb5.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.xinitrc
Diffstat (limited to '.xinitrc')
| -rw-r--r-- | .xinitrc | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,13 +1,13 @@ -#xmodmap ~/.Xmodmap +xmodmap ~/.Xmodmap #xrandr --output VGA1 --mode 1920x1080 -#xsetroot -solid "#002b36" -#numlockx & -#emacs --daemon & -#xbindkeys & +xsetroot -solid "#000000" +emacs --daemon & -exec ck-launch-session /usr/bin/herbstluftwm 2>&1 >> ~/.xsession_errors +wm=$1 +test -n "$wm" || wm=herbstluftwm +exec ck-launch-session $wm # Local Variables: # mode: shell-script # eval: (git-auto-commit-mode 1) |