export TMPDIR=$(echo ~/tmp)
fi;
-if [ "$HOSTNAME" == "archimedes" ]; then
- xmodmap -e 'keycode 158 = XF86AudioRaiseVolume'
- xmodmap -e 'keycode 146 = XF86AudioLowerVolume'
- xset r rate 170 40
+# No clue why this has changed from Alt_R to Down, but we really want Down.
+if ! xmodmap -pk|grep -qe '116.*Down'; then
+ xmodmap -e 'keycode 116 = Super_L'
+ xmodmap -e 'keycode 115 = Multi_key'
fi;
-
-xmodmap -e 'keycode 115 = Multi_key'
-xmodmap -e 'keycode 116 = Super_L'
xmodmap -e 'clear mod4'
-xmodmap -e 'add mod4 = Super_L'
+xmodmap -e 'add mod4 = Super_L Super_R'
if [ -e ~/.Xresources_$HOSTNAME ]; then
xrdb -merge < ~/.Xresources_$HOSTNAME;
cp -f .Xauthority .Xauthority.bak
fi;
-if [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
+if [ -x /usr/bin/xautolock ]; then
+ /usr/bin/xautolock -notifier true -bell 0 &
+elif [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
/usr/bin/xscreensaver &
fi;