X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=340c14b5c515776997272bcb93bfc8c399b63289;hb=f0023fea966438cc9984487764aeab504b2777b3;hp=72eb135e438e97560160590796272d61d45a8e6f;hpb=a1ee9a6209bd42b1773ff615ad270a31e400c66e;p=x_base.git

diff --git a/.xsession b/.xsession
index 72eb135..340c14b 100755
--- a/.xsession
+++ b/.xsession
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+echo "Starting new session"
+
 if locale -a |grep -qi en_US.utf8; then
     LANG="en_US.UTF-8"
 else
@@ -13,16 +15,13 @@ if [ -d ~/tmp ]; then
    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;
@@ -43,7 +42,7 @@ fi;
 
 if [ -x /usr/bin/awesome ]; then 
     exec /usr/bin/awesome;
-if [ -x /usr/bin/ion3 ]; then
+elif [ -x /usr/bin/ion3 ]; then
     exec /usr/bin/ion3;
 elif [ -x /usr/bin/openbox ]; then
         exec /usr/bin/openbox;