Merge branch 'master' of github.com:seantalts/dotfiles

Conflicts: _bashrc _vim/bundle/command-t _vim/bundle/fugitive
mutaku · Sep 18, 2011 · ea8fa49 · ea8fa49
2 parents 8af9d26 + 938fe33
commit ea8fa49
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/_bashrc b/_bashrc
@@ -84,8 +84,8 @@ if $TERM_IS_COLOR && ( dircolors --help && ls --color ) &> /dev/null; then
     [[ -f "$POSSIBLE_DIR_COLORS" ]] && [[ -r "$POSSIBLE_DIR_COLORS" ]] && eval `dircolors -b "$POSSIBLE_DIR_COLORS"` && break
   done
 
-  alias ls="ls --color=auto"
-  alias ll="ls --color=auto -l"
+  alias ls="ls --color=auto -F "
+  alias ll="ls --color=auto -l -F"
   alias grep='grep --color=auto'
   alias fgrep='fgrep --color=auto'
   alias egrep='egrep --color=auto'
@@ -131,11 +131,9 @@ if [ -x "/Applications/MacVim.app/Contents/MacOS/Vim" ]; then
     PATH=/Applications/MacVim.app/Contents/MacOS/:$PATH
 fi
 
-PATH=/usr/local/sbin:$PATH:/usr/local/mysql/bin
+PATH=~/bin:/usr/local/sbin:$PATH:/usr/local/mysql/bin
 export PATH
 
-
-
 PYTHONSTARTUP=~/.pythonrc.py
 export PYTHONSTARTUP
 
@@ -160,8 +158,8 @@ PS1="${TITLEBAR} \[\033[0;36m\]\$(parse_git_branch)\[\033[00m\] $ "
 }
 proml
 
-EDITOR='vim'
-
 if [ -e ~/.git-completion.bash ]; then
     source ~/.git-completion.bash
 fi
+
+export EDITOR=vim