X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=829cd01ff54f5ec909a70c470db3fbb75394d0d3;hb=6496521f13cb11a4fb8bc9ed367e8da30e16dde4;hp=45b63a6de76f8a8300b05f9f672c723e11c37885;hpb=1de3d4b7a55b2628eeccb0dd704c554bf8aee63e;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 45b63a6..829cd01 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -125,23 +125,28 @@ alias Gam="git commit --amend"
 
 alias Gl="git log --oneline --graph --decorate=short"
 alias Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'"
-alias Gr="git --no-pager log --oneline -n 20 | perl -ne 'print \"@~\$n \$_\"; \$n++'"
-alias Grr="git --no-pager log --oneline --graph -n 1024 | vi -c 'setlocal filetype=gitrebase buftype=nofile noswapfile' -"
 
 bindkey -s "OR" " git status --short\n" # F3
 # }}}
 
 # grep {{{
-GREP=/usr/local/bin/grep
-GREP_ARGS="--color=always --with-filename --line-number --dereference-recursive"
-LESS_COLORED="less --RAW-CONTROL-CHARS"
+GREP_ARGS=(
+    --colour=always
+    --with-filename
+    --line-number
+    --dereference-recursive
+    --binary-files=without-match
+    --exclude-dir=.git
+    --exclude-dir=.tags
+)
+LESS_COLOURED=(less --RAW-CONTROL-CHARS)
 g() {
-    $GREP ${=GREP_ARGS} $@ | ${=LESS_COLORED}
+    grep $GREP_ARGS $@ | $LESS_COLOURED
 }
 GS() {
-    $GREP ${=GREP_ARGS} $@ | sort --numeric-sort | ${=LESS_COLORED}
+    grep $GREP_ARGS $@ | sort --numeric-sort | $LESS_COLOURED
 }
-alias -g G="| $GREP --color"
+alias -g G="| grep --colour=always"
 alias gg="git grep "
 # }}}
 
@@ -208,7 +213,7 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
 # fzf {{{
 export FZF_DEFAULT_OPTS="--color=16 --info=inline"
 cf() {
-    local dir=$(find ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
+    local dir=$(find -L ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
         fzf --height 40% --reverse --preview="tree -CN {}")
     [[ -z $dir ]] || cd $dir
 }
@@ -220,3 +225,8 @@ while read w ; do
     hash -d ${w[1]}=${~${w[2]}}
 done < ~/.zhashd
 # }}}
+
+# autoenv {{{
+export AUTOENV_AUTH_FILE=~/.zautoenv-auth
+. ~/work/zsh-autoenv/autoenv.zsh
+# }}}