migrate away from .xsessionrc

This seems to interrupt Debian's /etc/Xsession machinery.

Other changes:

- call idempotent settings when reloading i3, too
- improve invocation of numlockx
- simplify scripts to remove items Xsession handles for us

1 files changed, 0 insertions, 70 deletions

diff --git a/.xsessionrc b/.xsessionrc
deleted file mode 100755
index dd82f5f0..00000000
--- a/.xsessionrc
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-. $HOME/.shenv
-
-normalise-x
-
-# ---- screen locking
-
-# Due to the ways the X root window and i3lock work, if we use
-# wallpaper then we have to resize it, set the root window and restart
-# i3lock each time an external monitor is added or removed.  That
-# requires some serious logic and probably isn't worth it.  Since I
-# plug and unplug my laptop from an external monitor a lot, just use
-# solid colour for now.  Could easily add some commits to set a
-# background and lockscreen on the dotfiles branches of machines that
-# have only one monitor
-
-# kill any other lockers that might have snuck in
-pkill -u $USER light-locker
-pkill -u $USER xscreensaver
-
-# turn over lid switch handling to logind, if needed
-if which xfconf-query; then
-    xfconf-query -c xfce4-power-manager -n \
-                 -p /xfce4-power-manager/logind-handle-lid-switch \
-                 -t bool -s true
-fi
-
-# ... and then hook i3lock into logind
-xss-lock -- i3lock -c 3f3f3f -n &
-
-# ---- GNOME daemons & GTK
-
-# Have the GNOME keyring daemon cache our GPG key passphrase for no
-# more than 20 minutes.  Cache time cannot be controlled for SSH keys
-gsettings set org.gnome.crypto.cache gpg-cache-ttl 1200
-gsettings set org.gnome.crypto.cache gpg-cache-method 'timeout'
-
-eval $(gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
-export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK
-
-gnome-settings-daemon &
-
-# ---- brightness keys
-
-xfce4-power-manager &
-
-# ---- clear SSH keys out of gnome-keyring-daemon when idle (per GNOME
-# ---- bug #525574 it can't do this itself yet)
-
-pkill -u $USER idlesshclear
-idlesshclear &
-
-# ---- audio
-
-if ! pgrep -u $USER pulseaudio; then
-    pulseaudio &
-fi
-
-# ---- startup applications
-
-redshift-gtk &                  # co-ords from config file
-nm-applet &
-caffeine-indicator &
-ibus-daemon &
-
-firefox &
-emacs --daemon &
-evolution &
-pgrep mpd || mpd