X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=17e58e923fb7ff769472f8003de709a2652e938b;hb=b7f8156192e65f4e9593d0d85f4ee79efea3c548;hp=78979895a75411806caf8260f8b8eabb4d595390;hpb=30004b962984085b3dc8fad9e2e538abd4c79ec4;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 7897989..17e58e9 100644
--- 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
-xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
-xmodmap -e "add Control = Control_L Control_R"
+# 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&
 
+twmnd&
+
 xset -b
 
 exec /usr/bin/ratpoison