X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=6890bf2bf95fb149794fe9d3022e146a0092228d;hb=bf66eaf74b6782bb56abc5ee977e77765b8662b9;hp=0c2dc6b055e36771ac75c6c0bc2497e07fefdc35;hpb=768ce91d46cc3a06c5842c91334bd88350ceab56;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 0c2dc6b..6890bf2 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,15 +15,24 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium|beryllium)
+    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