From 32bf165964d163a0024558d2b85a0ade94a1ce26 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <hsaxberg@yelp.com>
Date: Wed, 19 Mar 2014 09:39:37 -0700
Subject: [PATCH] removes some mac-specific cruft and colors ls

---
 bash-files/bashrc | 43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/bash-files/bashrc b/bash-files/bashrc
index 05c46f7..3ff2359 100644
--- a/bash-files/bashrc
+++ b/bash-files/bashrc
@@ -35,61 +35,46 @@ if [ -x /usr/bin/dircolors ]; then
     #alias vdir='vdir --color=auto'
 
 fi
-alias ls='ls --color=auto'
+
 alias grep='grep --color'
 alias fgrep='fgrep --color'
 alias egrep='egrep --color'
 
-# MacPorts Installer addition on 2012-07-11_at_04:34:47: adding an appropriate PATH variable for use with MacPorts.
-export PATH=/opt/local/bin:/opt/local/sbin:$PATH
-# Finished adapting your PATH environment variable for use with MacPorts.
+alias vim='~/local/bin/vim'
 
-alias vim='mvim -v'
-function ll(){ ls -lhF "$@"| egrep "^d" ; ls -lXB "$@" 2>&-| \
+function ll(){ ls -lhF --color=auto "$@"| egrep "^d" ; ls -lXB "$@" 2>&-| \
                 egrep -v "^d|total "; }
-alias ls="ls -hF"
-alias la='ls -Al'          # show hidden files
-alias lx='ls -lXB'         # sort by extension
-alias lk='ls -lSr'         # sort by size, biggest last
-alias lc='ls -ltcr'        # sort by and show change time, most recent last
-alias lu='ls -ltur'        # sort by and show access time, most recent last
-alias lt='ls -ltr'         # sort by date, most recent last
-alias lm='ls -al |more'    # pipe through 'more'
-alias lr='ls -lR'          # recursive ls
+
+alias ls="ls -hF --color=auto"
+alias la='ls -Al --color=auto'          # show hidden files
+alias lx='ls -lXB --color=auto'         # sort by extension
+alias lk='ls -lSr --color=auto'         # sort by size, biggest last
+alias lc='ls -ltcr --color=auto'        # sort by and show change time, most recent last
+alias lu='ls -ltur --color=auto'        # sort by and show access time, most recent last
+alias lt='ls -ltr --color=auto'         # sort by date, most recent last
+alias lm='ls -al --color=auto | more'    # pipe through 'more'
+alias lr='ls -lR --color=auto'          # recursive ls
 alias tree='tree -Csu'     # nice alternative to 'recursive ls'
 
 alias mkdir='mkdir -p'
 # aliases
 alias cd..="cd .."
-alias l="ls -al"
-alias lp="ls -p"
+alias lp="ls -p --color=auto"
 alias h=history
 
 # the "kp" alias ("que pasa"), in honor of tony p.
 alias kp="ps auxwww"
 
-alias ss="/System/Library/Frameworks/ScreenSaver.framework/Resources/ScreenSaverEngine.app/Contents/MacOS/ScreenSaverEngine -background &"
-
 # general path munging
 PATH=${PATH}:~/bin
 PATH=${PATH}:/usr/local/bin
 
-# postgres
-export PATH=${PATH}:/usr/local/pgsql/bin
-export PGDATA=/usr/local/pgsql/data
-
-
 if [ -f /opt/local/etc/bash_completion.d/git ]; then
     source /opt/local/etc/bash_completion.d/git
     export GIT_PS1_SHOWDIRTYSTATE=1
     export GIT_PS1_SHOWUPSTREAM=auto
 fi
 
-
-source ~/.git-flow-completion.bash
-
-#export PS1="$BLACK[ \u@$RED\h $GREEN\w$RED_BOLD\$(parse_git_branch)\$(parse_svn_branch)$BLACK ] "
-
 # configure my multi-line prompt
 export PS1="
 $BLACK[ \u@$RED\h $GREEN\w$RED_BOLD\$(parse_svn_branch)\$(__git_ps1 \" (%s)\") $BLACK]