xmonad.hs: Start Gimp to workspace "5" and use a special layout.

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
old mode 100644 (file)
new mode 100755 (executable)
index 0d9e6cc..d60a2ec
--- a/xinitrc
+++ b/xinitrc
@@ -1,14 +1,30 @@
+#!/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 XMonad.