.gitconfig: Use diff.algorithm = patience
[dotfiles.git] / .bash_profile
index 4ce8d2abd83bf25f68d2e7403acb40f3d36fcd7f..1122b044fafcea72179f4ffbd15080410a078b06 100644 (file)
@@ -5,22 +5,18 @@ if [ -f ~/.bashrc ]; then
   source ~/.bashrc
 fi
 
-# Change ANSI colors to Solarized-style colors
+# Set mintty color-palette
 if [ "$UNAME" = "Cygwin" ]; then
-  if [ -f ~/.term_colorpalette ]; then
-    source ~/.term_colorpalette
-  fi
+  source ~/.mintty/colors/solarized-ansi.sh
 fi
 
 # keychain
-keychain="$(type -P keychain)"
-test -n "$keychain" && {
+keychain=$(type -P keychain)
+test -n "$keychain" && \
+  test -z "$SUDO_USER" && {
   if [ -f ~/.ssh/id_rsa ]; then
     eval `$keychain -q ~/.ssh/id_rsa`
     source ~/.keychain/`hostname`-sh > /dev/null
   fi
 }
 unset keychain
-
-# Load RVM function
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"