X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=45fd16407ce1bec84e3391034cfad38c4429f64f;hb=191a1bf7bbd5859393f96929a5a8e1d3c12bd9e2;hp=7351026a8f65531e6052a7d0f3d82b636cf7ec70;hpb=c009782f6bce3f12a626b8de92742a958f60174c;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7351026..45fd164 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -83,7 +83,6 @@ alias m="less "
 alias -g M="| less"
 alias -g W="| wc -l | sed 's/ //g'"
 alias mc="mc --nomouse"
-alias sent="mutt -f =sent-\`date '+%y-%m'\`"
 
 f() {
     # find . -name "*$1*" -print
@@ -105,12 +104,12 @@ cddotdot() {
 zle -N cddotdot
 bindkey "OQ" cddotdot # F2
 
-pushdquiet() {
+popdquiet() {
     popd
     zle reset-prompt
 }
-zle -N pushdquiet
-bindkey "OS" pushdquiet # F4
+zle -N popdquiet
+bindkey "OS" popdquiet # F4
 # }}}
 
 # Git {{{
@@ -122,36 +121,35 @@ alias Gdc="git diff --cached"
 alias Gs="git show --show-signature"
 alias Gm="git diff --name-only --diff-filter=M"
 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_ARGS=(
-    --color=always
+    --colour=always
     --with-filename
     --line-number
     --dereference-recursive
+    --binary-files=without-match
+    --exclude-dir=.git
+    --exclude-dir=.tags
 )
-LESS_COLORED=(less --RAW-CONTROL-CHARS)
+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=always"
+alias -g G="| grep --colour=always"
 alias gg="git grep "
 # }}}
 
 # GPG agent {{{
-GPG_TTY=$(tty)
-export GPG_TTY
+export GPG_TTY=$(tty)
 # }}}
 
 # Virtualenv {{{
@@ -166,6 +164,7 @@ mailpath=(
     ~/mail/arbeit"?Neue Nachrichten in =arbeit"
 )
 alias arr="mutt -f \=arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
+alias sent="mutt -f =sent-\`date '+%y-%m'\`"
 bindkey -s "OP" " inc\n" # F1
 # }}}
 
@@ -174,7 +173,7 @@ zstyle ":completion:*:functions" ignored-patterns "_*"
 zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
 _mycomp () {
     [[ ${words[1]} != man ]] || { _man && return 0 }
-    [[ $CURRENT -eq 1 ]] && _command_names ||  _files && return 0
+    [[ $CURRENT -eq 1 ]] && _command_names || _files && return 0
     # MAGIC_EQUAL_SUBST {{{
     [[ $PREFIX = *\=* ]] || return 1
     compstate[parameter]=${PREFIX%%\=*}
@@ -212,9 +211,9 @@ 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
+    [[ -z $dir ]] || { print -s cd $dir ; cd $dir }
 }
 # }}}