Fix: misc xsession/autostart updates (2)

diff --git a/config.dot/autostart.link/README.md b/config.dot/autostart.link/README.md
index 9affbf4891899ba00f7154c949cd5af75c4bed65..b757e4e2fdc20c5e55c10acbc42ccc441c076895 100644 (file)
--- a/config.dot/autostart.link/README.md
+++ b/config.dot/autostart.link/README.md
@@ -1,5 +1,4 @@
-Disabling Gnome Keyring
-=======================
+# Disabling Gnome Keyring
 
 * [GnomeKeyring - GnuPG wiki](http://wiki.gnupg.org/GnomeKeyring).
 * [OpenPGP Smartcards and GNOME | Simon Josefsson's blog](http://blog.josefsson.org/2015/01/02/openpgp-smartcards-and-gnome/).

diff --git a/config.dot/autostart.link/gnome-keyring-gpg.desktop b/config.dot/autostart.link/gnome-keyring-gpg.desktop.disabled
similarity index 100%
rename from config.dot/autostart.link/gnome-keyring-gpg.desktop
rename to config.dot/autostart.link/gnome-keyring-gpg.desktop.disabled

diff --git a/config.dot/autostart.link/gnome-keyring-pkcs11.desktop b/config.dot/autostart.link/gnome-keyring-pkcs11.desktop.disabled
similarity index 100%
rename from config.dot/autostart.link/gnome-keyring-pkcs11.desktop
rename to config.dot/autostart.link/gnome-keyring-pkcs11.desktop.disabled

diff --git a/config.dot/autostart.link/gnome-keyring-secrets.desktop b/config.dot/autostart.link/gnome-keyring-secrets.desktop.disabled
similarity index 100%
rename from config.dot/autostart.link/gnome-keyring-secrets.desktop
rename to config.dot/autostart.link/gnome-keyring-secrets.desktop.disabled

diff --git a/config.dot/autostart.link/gnome-keyring-ssh.desktop b/config.dot/autostart.link/gnome-keyring-ssh.desktop.disabled
similarity index 100%
rename from config.dot/autostart.link/gnome-keyring-ssh.desktop
rename to config.dot/autostart.link/gnome-keyring-ssh.desktop.disabled

diff --git a/xsessionrc.dot.link b/xsessionrc.dot.link
index 1561c21ff6a26a37cde412f3baf16b6eaeace93c..c583e5257382b29934920073e42d0058c9ebe0e5 100755 (executable)
--- 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