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

diff --combined X/.xinitrc
index d04b5df0186b17ef58b22fe2855109c5f9118f0e,1b907ff54b6b7b8cad6c698955a61e908b8bb07f..86cfd39a5d3f3711885d7071fd5ad16fd6e06f23
--- 1/X/.xinitrc
--- 2/X/.xinitrc
+++ b/X/.xinitrc
@@@ -16,33 -16,39 +16,34 @@@ f
  # Load .Xresources
  xrdb -merge ~/.Xresources &> /dev/null
  if [ -f ~/.Xresources.$HOSTNAME ]; then
-     xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+   xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
  fi
  
  # 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
  case $HOSTNAME in
-     beryllium)
-       xrandr --output HDMI-1 --left-of DVI-I-1 
-       ;;
-     *)
-       ;;
+   beryllium)
+     xrandr --output HDMI-1 --left-of DVI-I-1 
+     ;;
+   *)
+     ;;
  esac
  
  # Set java font option
@@@ -56,21 -62,21 +57,22 @@@ xset -
  
  #if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
  #    eval $(gpg-agent --daemon \
- #                  --use-standard-socket \
- #                  --write-env-file "${HOME}/.gpg-agent-info")
+   #                --use-standard-socket \
+   #                --write-env-file "${HOME}/.gpg-agent-info")
  #fi
  #
  #gpg-connect-agent updatestartuptty /bye >/dev/null
  
  # 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