diff options
Diffstat (limited to 'xsessionrc.dot.link')
| -rwxr-xr-x | xsessionrc.dot.link | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/xsessionrc.dot.link b/xsessionrc.dot.link index 1561c21..c583e52 100755 --- a/xsessionrc.dot.link +++ b/xsessionrc.dot.link @@ -1,6 +1,6 @@ #!/bin/bash # -# .xsession: set basic X11 environment +# .xsessionrc: set basic X11 environment # # Background image @@ -68,11 +68,6 @@ if which xcompmgr > /dev/null 2>&1; then xcompmgr -c & fi -# Set window manager -if [ -z "$WINDOW_MANAGER" ]; then - WINDOW_MANAGER='awesome' -fi - # Custom SSH_ASKPASS config # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606934 #export SSH_ASKPASS="/usr/bin/ssh-askpass-fullscreen" @@ -80,15 +75,6 @@ fi #export SSH_ASKPASS="" export SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass" -# SSH agent startup; this is now handled by ~/.config/autostart. -#eval `ssh-agent -s` -#usr/bin/gnome-keyring-daemon --start --components=ssh - -# SSH keys -#if [ -x "$HOME/apps/utils-ssh/ssh-agent-loadkeys" ]; then -# . $HOME/apps/utils-ssh/ssh-agent-loadkeys -#fi - # Make sure to load the profile # # Use SETCDPATH workaround as there might be some weird bug @@ -196,6 +182,11 @@ export AWT_TOOLKIT=MToolkit # Next window config (keyringer) export XDOTOOL_NEXT_WINDOW="Super_L+Tab" +# Set window manager +if [ -z "$WINDOW_MANAGER" ]; then + WINDOW_MANAGER='awesome' +fi + # Start window manager on old systems if [ "$OSVERSION" = "7" ] || [ "$START_WINDOW_MANAGER" = "true" ]; then $WINDOW_MANAGER |