aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.dot/autostart.link/README.md3
-rw-r--r--config.dot/autostart.link/gnome-keyring-gpg.desktop.disabled (renamed from config.dot/autostart.link/gnome-keyring-gpg.desktop)0
-rw-r--r--config.dot/autostart.link/gnome-keyring-pkcs11.desktop.disabled (renamed from config.dot/autostart.link/gnome-keyring-pkcs11.desktop)0
-rw-r--r--config.dot/autostart.link/gnome-keyring-secrets.desktop.disabled (renamed from config.dot/autostart.link/gnome-keyring-secrets.desktop)0
-rw-r--r--config.dot/autostart.link/gnome-keyring-ssh.desktop.disabled (renamed from config.dot/autostart.link/gnome-keyring-ssh.desktop)0
-rwxr-xr-xxsessionrc.dot.link21
6 files changed, 7 insertions, 17 deletions
diff --git a/config.dot/autostart.link/README.md b/config.dot/autostart.link/README.md
index 9affbf4..b757e4e 100644
--- 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
index 616306d..616306d 100644
--- a/config.dot/autostart.link/gnome-keyring-gpg.desktop
+++ b/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
index 615bb60..615bb60 100644
--- a/config.dot/autostart.link/gnome-keyring-pkcs11.desktop
+++ b/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
index c3f457c..c3f457c 100644
--- a/config.dot/autostart.link/gnome-keyring-secrets.desktop
+++ b/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
index 7f9bdf5..7f9bdf5 100644
--- a/config.dot/autostart.link/gnome-keyring-ssh.desktop
+++ b/config.dot/autostart.link/gnome-keyring-ssh.desktop.disabled
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