Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --cc X/.xinitrc
index d04b5df0186b17ef58b22fe2855109c5f9118f0e,1b907ff54b6b7b8cad6c698955a61e908b8bb07f..86cfd39a5d3f3711885d7071fd5ad16fd6e06f23
--- 1/X/.xinitrc
--- 2/X/.xinitrc
+++ b/X/.xinitrc
@@@ -21,19 -21,25 +21,20 @@@ f
  
  # 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"
 -    ;;
 -  iridium)
 -    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"
 -    ;;
 -  *)
 +    palladium|platinum|iridium)
 +      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
@@@ -64,13 -70,13 +65,14 @@@ xset -
  
  # Battery monitoring
  case $HOSTNAME in
 -  palladium)
 -    xbattmon&
 -    ;;
 -  iridium)
 -    ~/.local/bin/bat_mgt.sh&
 -    ;;
 -  *)
 +      palladium)
 +              xbattmon&
 +              ;;
 +      iridium|platinum)
 +              ~/.local/bin/bat_mgt.sh&
 +              ;;
 +      *)
++                ;;
  esac
  
  cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc