Merge remote branch 'asp/master'

diff --git a/xinitrc b/xinitrc
index 2a6866b86e812dc5383efbb755a3ae216f031015..d60a2ec4acd26baf65647e3b133b7970326a1467 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -1,18 +1,29 @@
+#!/bin/sh
+
 # startx configuration file.
 
 
 # Use a black background for the root window.
 xsetroot -solid black
 
+# Force English keyboard layout.
+if [ -x /usr/bin/setxkbmap ]; then
+    setxkbmap us
+fi
+
 # Use my X11 key bindings.
 xmodmap ~/.xmodmaprc
 
 # Change the background if available.
 if [ -f ~/.background ]; then
-    if [ -x /usr/bin/hsetroot ]; then
-        hsetroot -full ~/.background
-    elif [ -x /usr/bin/feh ]; then
-        feh --bg-scale ~/.background
+    # But not on slow machines in the university.
+    HOSTNAME=`hostname`
+    if [ "x`echo $HOSTNAME | grep faui0sr`" = x ]; then
+        if [ -x /usr/bin/hsetroot ]; then
+            hsetroot -full ~/.background
+        elif [ -x /usr/bin/feh ]; then
+            feh --bg-scale ~/.background
+        fi
     fi
 fi