X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=6890bf2bf95fb149794fe9d3022e146a0092228d;hb=57fc2e59302374ab7f6c58e1df5cafe1b8df064b;hp=857c4b0fc3ac29e47e3826abce6119b3eecdd855;hpb=0a4160b7d8128ad2d73671654df1599ef0a64c77;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 857c4b0..6890bf2 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,12 +15,35 @@ 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"
@@ -29,6 +52,4 @@ feh --bg-scale ~/Pictures/background.jpg&
 
 xset -b
 
-setxkbmap -option 'ctrl:nocaps'
-
 exec /usr/bin/ratpoison