diff --git a/.xinitrc b/.xinitrc index 3dcbea9..8f82752 100755 --- a/.xinitrc +++ b/.xinitrc @@ -1,17 +1,17 @@ [ -f /etc/xprofile ] && . /etc/xprofile [ -f ~/.xprofile ] && . ~/.xprofile +[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources +/usr/bin/xcompmgr & +/usr/bin/xscreensaver -no-splash & +eval $(/usr/bin/gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info") DEFAULT_SESSION=awesome case "$1" in default|awesome|"") - [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources - xcompmgr & - /usr/bin/xscreensaver -no-splash & - eval $(/usr/bin/gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info") exec awesome ;; - weston|weston-launch) - exec weston-launch + qtile) + exec qtile ;; *) exec $DEFAULT_SESSION ;; esac