X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bash_profile;h=a10989b0adce6a1219ef30f4717a1cfccf5f9c99;hb=5f8135d931908809a284f939f8e1a5a11b786a26;hp=ea2bb880db6ed7b83ece762970dbc94afa8b7510;hpb=522238a770726e468a1f7f9710236fdb372b7468;p=max%2Fdotfiles.git diff --git a/bash/.bash_profile b/bash/.bash_profile index ea2bb88..a10989b 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -36,15 +36,20 @@ if [ -f ~/.Xresources ]; then fi fi +if [ -f ~/.config/termite/config.base ]; then + cat ~/.config/termite/config.base ~/.config/termite/config.${HOSTNAME} > \ + ~/.config/termite/config +fi + if [ $HOSTNAME = "magnesium" ]; then export XKB_DEFAULT_LAYOUT=us export XKB_DEFAULT_VARIANT=colemak - export XKB_DEFAULT_OPTIONS=caps:ctrl_modifier + export XKB_DEFAULT_OPTIONS=ctrl:nocaps fi if [ $HOSTNAME = "platinum" ]; then export XKB_DEFAULT_LAYOUT=gb export XKB_DEFAULT_VARIANT=colemak - export XKB_DEFAULT_OPTIONS=caps:ctrl_modifier + export XKB_DEFAULT_OPTIONS=ctrl:nocaps fi