add teltox .Xresources

[x_base.git] / .xsession

diff --git a/.xsession b/.xsession
index 14d991fd297892e0f11c265578b40708945bffc0..340c14b5c515776997272bcb93bfc8c399b63289 100755 (executable)
--- 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;
@@ -32,11 +31,18 @@ if [ -e ~/.xsession_$HOSTNAME ]; then
     . ~/.xsession_$HOSTNAME
 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
+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;