From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 7 Dec 2017 13:59:05 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=1b17ece26e2019c0d2d2eb3d612e2dff5cca0169;p=max%2Fdotfiles.git

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

1b17ece26e2019c0d2d2eb3d612e2dff5cca0169
diff --cc X/.xinitrc
index d04b5df,1b907ff..86cfd39
--- a/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