Treat any mail containing @aber.ac.uk as in the aber mailbox

[max/dotfiles.git] / X / .xinitrc

diff --git a/X/.xinitrc b/X/.xinitrc
index 857c4b0fc3ac29e47e3826abce6119b3eecdd855..17e58e923fb7ff769472f8003de709a2652e938b 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,20 +15,43 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
-setxkbmap -variant colemak gb
+# Set keyboard layout
+case $HOSTNAME in
+    palladium)
+       setxkbmap -variant colemak gb
+       xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+       xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+       xmodmap -e "add Control = Control_L Control_R"
+       ;;
+    beryllium)
+       setxkbmap -variant colemak us
+       xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+       xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+       xmodmap -e "add Control = Control_L Control_R"
+       ;;
+    *)
+esac
 
 # Set screen layout
-xrandr --output VGA1 --right-of HDMI1
-
+case $HOSTNAME in
+    beryllium)
+       xrandr --output VGA1 --right-of HDMI1
+       ;;
+    *)
+       ;;
+esac
 
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
-xset -b
+twmnd&
 
-setxkbmap -option 'ctrl:nocaps'
+xset -b
 
 exec /usr/bin/ratpoison