X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=b495593882dc6b640f33481d2a9064767319b762;hb=bcdb616f7c3af3d779ad7bf979be7c3a0fe9d404;hp=42dbbb4121d75b67a0d530b3837dcb97b4737d45;hpb=e7c927d390cefc1aeda054224207841c435f588b;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 42dbbb4..b495593 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,10 +1,10 @@
 # vim: foldmethod=marker:foldlevel=0
 
 # Basic options {{{
-setopt INTERACTIVE_COMMENTS
 setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
 setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
+setopt PIPE_FAIL
 
 setopt RM_STAR_SILENT
 export LISTMAX=9999
@@ -13,7 +13,7 @@ export LISTMAX=9999
 # History options {{{
 setopt APPEND_HISTORY SHARE_HISTORY INC_APPEND_HISTORY HIST_IGNORE_ALL_DUPS
 setopt HIST_IGNORE_SPACE
-HISTORY_IGNORE="(yt* *|t *|t|mmfileget *|arr|rss)"
+HISTORY_IGNORE="(yt* *|t *|t|sdcv *|mmfileget *|arr)"
 # }}}
 
 # Vi mode {{{
@@ -22,8 +22,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 {{{
@@ -40,7 +40,7 @@ bindkey "^[[A" history-beginning-search-backward-end
 bindkey "^[[B" history-beginning-search-forward-end
 
 beginning-history-incremental-pattern-search-backward() {
-    zle history-incremental-pattern-search-backward $(echo $BUFFER | sed "s/ /*/g")
+    zle history-incremental-pattern-search-backward ${BUFFER:gs/ /*/}
 }
 zle -N beginning-history-incremental-pattern-search-backward
 bindkey "^[[1;2A" beginning-history-incremental-pattern-search-backward
@@ -50,14 +50,14 @@ bindkey -M isearch "^[[B" history-incremental-pattern-search-forward
 
 # Prompt {{{
 function zle-line-init zle-keymap-select {
-    mode_vi="${${KEYMAP/vicmd/+}/(main|viins)/-}"
-    [ $timer ] && timer_show=$(( $SECONDS - $timer ))
-    prompt="%2~|"
+    mode_vi=${${KEYMAP/vicmd/+}/(main|viins)/-}
+    [[ $timer ]] && timer_show=$(( $SECONDS - $timer ))
+    prompt="%2~ "
     prompt+="%U${timer_show}%u|"
     prompt+="%B%?%b"
     prompt+="${mode_vi}"
     prompt+="%B%F{magenta}%#%f%b "
-    PS1="$prompt"
+    PS1=$prompt
     zle reset-prompt
 }
 zle -N zle-line-init
@@ -75,23 +75,21 @@ 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"
+alias -g W="| wc -l | sed 's/ //g'"
 alias mc="mc --nomouse"
 
 f() {
-    # find . -name "*$1*" -print
-    print -C 1 **$1*
+    find . -name "*$1*" -print
 }
 
+alias ssh="TERM=xterm ssh"
+alias sshnm="ssh -S none"
 ssht() {
-    ssh -C -t "$1" tmux attach -t0
+    ssh -C -t $1 tmux attach -t0
 }
-alias sshnm="ssh -S none"
 # }}}
 
 # Faster movement {{{
@@ -103,12 +101,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 {{{
@@ -116,41 +114,38 @@ alias Ga="git add"
 alias Gb="git branch"
 alias Gc="git checkout"
 alias Gd="git diff"
-alias Gs="git show"
+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"
-
-git_common="--oneline --abbrev-commit"
-alias Gl="git log $git_common --graph --decorate=short"
-alias Gr="git --no-pager log $git_common -n 20 | perl -ne 'print \"@~\$n \$_\"; \$n++'"
-alias Grr="git --no-pager log $git_common --graph -n 1024 | vi -c 'setlocal filetype=gitrebase buftype=nofile noswapfile' -"
+alias Gl="git log --oneline --graph --decorate=short"
+alias Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'"
 
 bindkey -s "OR" " git status --short\n" # F3
 # }}}
 
 # grep {{{
-GREP=/usr/local/bin/grep
-GREP_ARGS="--color=always --with-filename --line-number --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
+)
 g() {
-    $GREP ${=GREP_ARGS} $@ | ${=LESS_COLORED}
+    grep $GREP_ARGS $@ | less
 }
 GS() {
-    $GREP ${=GREP_ARGS} $@ | sort --numeric-sort | ${=LESS_COLORED}
+    grep $GREP_ARGS $@ | sort --numeric-sort | less
 }
-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 {{{
@@ -159,28 +154,19 @@ mailpath=(
     ~/mail/arbeit"?Neue Nachrichten in =arbeit"
 )
 alias arr="mutt -f \=arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
-alias rss="mutt -f \=rss"
+alias sent="mutt -f =sent-\`date '+%y-%m'\`"
 bindkey -s "OP" " inc\n" # F1
 # }}}
 
-# Calculator {{{
-autoload -U zcalc
-alias zc="zcalc"
-# }}}
-
-# 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
+    [[ ${words[1]} != man ]] || { _man && return 0 }
+    [[ $CURRENT -eq 1 ]] && _command_names || _files && return 0
     # MAGIC_EQUAL_SUBST {{{
-    [[ "$PREFIX" = *\=* ]] || return 1
-    compstate[parameter]="${PREFIX%%\=*}"
+    [[ $PREFIX = *\=* ]] || return 1
+    compstate[parameter]=${PREFIX%%\=*}
     compset -P 1 "*="
     _value
     # }}}
@@ -195,11 +181,12 @@ autoload -U complist
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 . ~/work/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 typeset -A ZSH_HIGHLIGHT_STYLES
-ZSH_HIGHLIGHT_STYLES[assign]="fg=cyan"
+ZSH_HIGHLIGHT_STYLES[assign]="fg=yellow"
 ZSH_HIGHLIGHT_STYLES[commandseparator]="fg=red"
 ZSH_HIGHLIGHT_STYLES[single-hyphen-option]="fg=green,bold"
 ZSH_HIGHLIGHT_STYLES[double-hyphen-option]="fg=green"
 ZSH_HIGHLIGHT_STYLES[globbing]="fg=magenta"
+ZSH_HIGHLIGHT_STYLES[global-alias]="fg=yellow,bold"
 ZSH_HIGHLIGHT_STYLES[history-expansion]="fg=magenta"
 ZSH_HIGHLIGHT_STYLES[redirection]="fg=red"
 ZSH_HIGHLIGHT_STYLES[path]="fg=white,underline"
@@ -210,3 +197,28 @@ ZSH_HIGHLIGHT_STYLES[path_pathseparator]="fg=white,bold,underline"
 . ~/work/zsh-autosuggestions/zsh-autosuggestions.zsh
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
 # }}}
+
+# fzf {{{
+cf() {
+    local dir=$(find -L ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
+        fzf --height 40% --reverse --preview="tree -CN {}")
+    [[ -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
+}
+# }}}