X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=d60a2ec4acd26baf65647e3b133b7970326a1467;hb=093b175a6e8d192f0ffa011fc362adc788e6e1a0;hp=7513f8203bdd6ea1daea369439144ecc11865961;hpb=f3394ebbb4fea4997b3c5cd6ebe0f126985b7284;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
old mode 100644
new mode 100755
index 7513f82..d60a2ec
--- a/xinitrc
+++ b/xinitrc
@@ -1,17 +1,33 @@
+#!/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
-    hsetroot -full ~/.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
 
-# Start stumpwm.
+# Start XMonad.
 xmonad
 
 # vim: ft=sh