X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=73802a3ae367024827f2ed201d89c674fd5ec8ec;hb=9905148d5092722d5ec7aae9cbf6c6a96c5631f5;hp=7a8164246d6bcbe571e7dc24ad85b34a8d16dc3c;hpb=d4ca812e1d6cfda1c41a4cfa4ab5bb06365ca46f;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7a81642..73802a3 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -23,8 +23,8 @@ export KEYTIMEOUT=1
 # }}}
 
 # Home/end {{{
-bindkey "^[[1~" beginning-of-line
-bindkey "^[[4~" end-of-line
+bindkey "^[[1~" beginning-of-line # Home
+bindkey "^[[4~" end-of-line # End
 # }}}
 
 # Command-line editing {{{
@@ -76,24 +76,22 @@ precmd() {
 # Aliases {{{
 alias l="ls -AF "
 alias ll="ls -AFl "
-alias ssh="TERM=xterm ssh"
 alias vi="vim"
-alias more="less"
 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
     print -C 1 **$1*
 }
 
+alias ssh="TERM=xterm ssh"
+alias sshnm="ssh -S none"
 ssht() {
     ssh -C -t $1 tmux attach -t0
 }
-alias sshnm="ssh -S none"
 # }}}
 
 # Faster movement {{{
@@ -105,12 +103,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,38 +120,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=/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 "
 # }}}
 
 # GPG agent {{{
-GPG_TTY=$(tty)
-export GPG_TTY
-# }}}
-
-# Virtualenv {{{
-venv() {
-    . /usr/local/bin/virtualenvwrapper.sh
-}
+export GPG_TTY=$(tty)
 # }}}
 
 # Mail {{{
@@ -162,19 +157,16 @@ 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
 # }}}
 
-# Named directories {{{
-. ~/.zhashd
-# }}}
-
 # Completion {{{
 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%%\=*}
@@ -210,10 +202,26 @@ 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 }
+}
+# }}}
+
+# Named directories {{{
+while read w ; do
+    w=(${(s/=/)w})
+    hash -d ${w[1]}=${~${w[2]}}
+done < ~/.zhashd
+# }}}
+
+# autoenv {{{
+. ~/work/zsh-autoenv/autoenv.zsh
+# }}}
+
+# Virtualenv {{{
+venv() {
+    . /usr/local/bin/virtualenvwrapper.sh
 }
 # }}}