.vimrc: Disable g:airline_symbols.colnr symbol

[dotfiles.git] / .bash_profile

diff --git a/.bash_profile b/.bash_profile
index 1947c3b0b2291040dde1ddfb955c0bbef8eff580..1122b044fafcea72179f4ffbd15080410a078b06 100644 (file)
--- a/.bash_profile
+++ b/.bash_profile
@@ -7,18 +7,16 @@ fi
 
 # Set mintty color-palette
 if [ "$UNAME" = "Cygwin" ]; then
-  source ~/.mintty/colors/solarized-alt.sh
+  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"