GREP_OPTIONS is deprecated

.bash_aliases

@@ -13,8 +13,8 @@ alias llta="ls $LS_OPTIONS -FlhtrA"
 alias lls="ls $LS_OPTIONS -FlhSr"
 alias llsa="ls $LS_OPTIONS -FlhSrA"
 
-# Don't try to connect to the X server- shortens startup time.
-alias vim='vim -X'
+alias grep='grep --color=auto --devices=skip --binary-files=without-match'
+
 alias vi=vim
 
 # Use human-readable unit sizes, in base 2.
@@ -41,6 +41,8 @@ alias sqlite=sqlite3
 
 case $OSTYPE in
     darwin*)
+        # Don't try to connect to the X server- shortens startup time.
+        alias vim='vim -X'
         alias gvim=mvim
         ;;
     *)

.bashrc

@@ -84,7 +84,6 @@ export LESS_TERMCAP_se=$ANSI_RESET
 export LESS_TERMCAP_ue=$ANSI_RESET
 export LESS_TERMCAP_us=${ANSI_BOLD}${ANSI_GREEN}
 
-export GREP_OPTIONS='--color=auto --devices=skip --binary-files=without-match'
 export GREP_COLOR='33;44'
 
 if ls --version >/dev/null 2>&1; then