update awesomes config

[x_base.git] / .xsession

diff --git a/.xsession b/.xsession
old mode 100644 (file)
new mode 100755 (executable)
index ac39605..340c14b
--- a/.xsession
+++ b/.xsession
@@ -1,4 +1,12 @@
-LANG="en_US.UTF-8"
+#!/bin/sh
+
+echo "Starting new session"
+
+if locale -a |grep -qi en_US.utf8; then
+    LANG="en_US.UTF-8"
+else
+    LANG=C
+fi;
 export LANG
 
 HOSTNAME=$(hostname)
@@ -7,12 +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'
-    xmodmap -e 'keysym Super_L = Multi_key'
-    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 'clear mod4'
+xmodmap -e 'add mod4 = Super_L Super_R'
 
 if [ -e ~/.Xresources_$HOSTNAME ]; then
     xrdb -merge < ~/.Xresources_$HOSTNAME;
@@ -22,29 +31,20 @@ 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;
+# make a backup of the .Xauthority
+if [ -e ~/.Xauthority ]; then
+    cp -f .Xauthority .Xauthority.bak
 fi;
 
 if [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
     /usr/bin/xscreensaver &
 fi;
 
-#if [ -x /usr/bin/ion3 ]; then
-#    exec /usr/bin/ion3;
-#el
-if [ -x /usr/bin/openbox ]; then
+if [ -x /usr/bin/awesome ]; then 
+    exec /usr/bin/awesome;
+elif [ -x /usr/bin/ion3 ]; then
+    exec /usr/bin/ion3;
+elif [ -x /usr/bin/openbox ]; then
         exec /usr/bin/openbox;
 elif [ -x /usr/bin/rxvt ]; then
         exec /usr/bin/rxvt;