X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=778759a9695789328f15cd2cebb14178e412dae2;hb=9f3136fba1e022b17a1293e0fc9bead012d49c80;hp=b0c5e6a3c39af07fcc79d5a69a127cc33739248c;hpb=48338303d760027e62bab963fa11a940bc0d97eb;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index b0c5e6a..778759a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -81,10 +81,9 @@ alias vi="vim"
 alias more="less"
 alias m="less "
 alias -g M="| less"
-alias -g W="| wc -l"
+alias -g W="| wc -l | sed 's/ //g'"
 alias mc="mc --nomouse"
 alias sent="mutt -f =sent-\`date '+%y-%m'\`"
-alias zc=~/bin/dc-wrapped.sh
 
 f() {
     # find . -name "*$1*" -print
@@ -133,16 +132,23 @@ 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 "
 # }}}
 
@@ -166,10 +172,6 @@ alias arr="mutt -f \=arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
 bindkey -s "OP" " inc\n" # F1
 # }}}
 
-# Named directories {{{
-. ~/.zhashd
-# }}}
-
 # Completion {{{
 zstyle ":completion:*:functions" ignored-patterns "_*"
 zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
@@ -218,3 +220,15 @@ cf() {
     [[ -z $dir ]] || cd $dir
 }
 # }}}
+
+# Named directories {{{
+while read w ; do
+    w=(${(s/=/)w})
+    hash -d ${w[1]}=${~${w[2]}}
+done < ~/.zhashd
+# }}}
+
+# autoenv {{{
+export AUTOENV_AUTH_FILE=~/.zautoenv-auth
+. ~/work/zsh-autoenv/autoenv.zsh
+# }}}