be inteligent about setting lang where possible; set super_r and multi_key differently

diff --git a/.xsession b/.xsession
index f4bfd271883dd1e4287891747b6d5f657d8a6612..015fe7ac9a15ad67e5123ffc451e96fdf2f23de2 100644 (file)
--- a/.xsession
+++ b/.xsession
@@ -1,4 +1,8 @@
-LANG="en_US.UTF-8"
+if locale -a |grep -qi en_US.utf8; then
+    LANG="en_US.UTF-8"
+else
+    LANG=C
+fi;
 export LANG
 
 HOSTNAME=$(hostname)
@@ -10,10 +14,14 @@ fi;
 if [ "$HOSTNAME" == "archimedes" ]; then
     xmodmap -e 'keycode 158 = XF86AudioRaiseVolume'
     xmodmap -e 'keycode 146 = XF86AudioLowerVolume'
-    xmodmap -e 'keysym Super_L = Multi_key'
     xset r rate 170 40
 fi;
 
+xmodmap -e 'keycode 116 = Multi_key'
+xmodmap -e 'keycode 115 = Super_L'
+xmodmap -e 'clear mod4'
+xmodmap -e 'add mod4 Super_L'
+
 if [ -e ~/.Xresources_$HOSTNAME ]; then
     xrdb -merge < ~/.Xresources_$HOSTNAME;
 fi;
@@ -22,21 +30,6 @@ if [ -e ~/.xsession_$HOSTNAME ]; then
     . ~/.xsession_$HOSTNAME
 fi;
 
-
-# if [ -x /usr/bin/gkrellm ]; then
-#      /usr/bin/gkrellm &
-# fi
-# 
-# if [ -x /usr/bin/xmms ]; then
-#      /usr/bin/xmms &
-# fi
-
-if [ -x /usr/bin/xsetbg ]; then 
-    if [ "$(hostname)" == "archimedes" ] && [ -r /home/don/pictures/dh-demon_tag.jpg ]; then
-       /usr/bin/xsetbg -zoom 125 -fit -center -border gray17 /home/don/pictures/dh-demon_tag.jpg
-    fi;
-fi;
-
 if [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
     /usr/bin/xscreensaver &
 fi;