.tmux.conf: Minor theme tweaks
[dotfiles.git] / .bash_profile
index 5646308c71d4cd3d4cd35b6daa40ea142454b9cc..aa883acff9c74b0776bb28c3a6bb0fc18129ee21 100644 (file)
@@ -5,12 +5,23 @@ if [ -f ~/.bashrc ]; then
   source ~/.bashrc
 fi
 
+# Set mintty color-palette
+if [ "$UNAME" = "Cygwin" ]; then
+  source ~/.mintty/colors/solarized-ansi.sh
+fi
+
 # keychain
-keychain="$(type -P keychain)"
-test -n "$keychain" && {
-  if [ -f ~/.ssh/id_dsa ]; then
-    eval `$keychain -q ~/.ssh/id_dsa`
+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
+
+# rbenv
+rbenv=$(type -P rbenv)
+test -n "$rbenv" && eval "$(rbenv init -)"
+unset rbenv