xinitrc: Force English keyboard layout.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index bb7f192b054b4f2c44dc2574c11a27505e1c333f..5aaceac4c944a1e93833131993e339e41e9e1bf3 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -5,12 +5,42 @@
 
 . ../lib.sh
 
-# Link setup.
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
+if installed xmonad; then
+    link . ~/.xmonad
+fi
+
 if installed X; then
-    link xinitrc ~/.xinitrc
+    # Prevent code duplication. Term* rules are for all terminals; XTerm rules
+    # are for XTerm and UXTerm. At the moment XTerm, UXTerm and Rxvt are
+    # supported.
+    generate perl Xdefaults -ne \
+        'if (/^Term/) {
+             s/^Term//;
+             print "XTerm", $_;
+             print "UXTerm", $_;
+             print "Rxvt", $_;
+         } elsif (/^XTerm/) {
+             print $_;
+             s/^XTerm//;
+             print "UXTerm", $_;
+         } else {
+             print $_;
+         }'
+    # Xdefaults uses ! as comment instead of #. tmp file necessary because of
+    # different implementations of `sed -i`.
+    sed 's/^#/!/' Xdefaults > Xdefaults.tmp
+    mv Xdefaults.tmp Xdefaults
+
+    if [ x`os` != xdarwin ]; then
+        link xinitrc ~/.xinitrc
+    fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
 fi
+
+if installed xpdf; then
+    link xpdfrc ~/.xpdfrc
+fi