X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=a031825e5dcc5703b8da221fef55f1fa27537748;hb=8f540bfb294f5fadf9e15d85c668c8dda3ced64c;hp=78979895a75411806caf8260f8b8eabb4d595390;hpb=30004b962984085b3dc8fad9e2e538abd4c79ec4;p=max%2Fdotfiles.git diff --git a/X/.xinitrc b/X/.xinitrc index 7897989..a031825 100644 --- a/X/.xinitrc +++ b/X/.xinitrc @@ -15,14 +15,29 @@ 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|beryllium) + 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" + ;; + *) +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"