Shuffling around some aliases

aliases

@@ -5,6 +5,12 @@ alias cp='cp -i'
 alias mv='mv -i'
 alias rm='rm -i'
 
+# Colorize output
+alias ls='ls --color=auto'
+
+# Colorize output and some exclusions
+alias grep="grep --color=auto --exclude-dir={.*,artwork,node_modules,vendor}"
+
 # Git aliases
 alias g='git'
 alias ga='git add'

env

@@ -1,5 +1,4 @@
 export DOTFILES=$HOME/.dotfiles
-export GREP_EXCLUDE_DIR="{.git,.sass-cache,artwork,node_modules,vendor}"
 export OS=`uname`
 
 export CLICOLOR=1

zshrc

@@ -59,13 +59,6 @@ bindkey '\e[6~' down-history
 
 if [ -x /usr/bin/dircolors ]; then
   eval `dircolors $DOTFILES/vendor/seebi/dircolors-solarized/dircolors.ansi-dark`
-  alias ls='ls --color=auto'
-
-  GREP_FLAGS=" --color=auto --exclude-dir=${GREP_EXCLUDE_DIR}"
-
-  alias grep="grep ${GREP_FLAGS}"
-  alias egrep="egrep ${GREP_FLAGS}"
-  alias fgrep="fgrep ${GREP_FLAGS}"
 fi
 
 git_branch() {