X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=blobdiff_plain;f=zsh%2F.zshrc;h=7e8cc22ec3218606c277d494fff631cce7ac0aec;hp=a2a95d18e61f4b9c7b18fd29a9a3e4c84776d613;hb=38c1b0544d9528bc787b5c258b9c0fdacdcd86da;hpb=2fc4ee6fa72badb10e73c949f697f0e41a859d27

diff --git a/zsh/.zshrc b/zsh/.zshrc
index a2a95d1..7e8cc22 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,25 +1,30 @@
 # vim: foldmethod=marker:foldlevel=0
 
 # Basic options {{{
-setopt APPEND_HISTORY SHARE_HISTORY INC_APPEND_HISTORY HIST_IGNORE_ALL_DUPS
-setopt HIST_IGNORE_SPACE
-setopt INTERACTIVE_COMMENTS
 setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
 setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
+setopt PIPE_FAIL
+setopt MULTIBYTE
 
 setopt RM_STAR_SILENT
 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|sdcv *|mmfileget *|arr)"
+# }}}
+
 # Vi mode {{{
 bindkey -v
 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 {{{
@@ -34,19 +39,26 @@ zle -N history-beginning-search-backward-end history-search-end
 zle -N history-beginning-search-forward-end history-search-end
 bindkey "^[[A" history-beginning-search-backward-end
 bindkey "^[[B" history-beginning-search-forward-end
-bindkey "^R" history-incremental-search-backward
+
+beginning-history-incremental-pattern-search-backward() {
+    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
+bindkey -M isearch "^[[A" history-incremental-pattern-search-backward
+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~|"
-    prompt+="%U${timer_show}%u|"
+    local state="%#" timer_val="?"
+    [[ ${KEYMAP} == vicmd ]] && state="+"
+    [[ $timer ]] && timer_val=$(( $SECONDS - $timer ))
+    prompt="%2~ "
+    prompt+="%U${timer_val}%u|"
     prompt+="%B%?%b"
-    prompt+="${mode_vi}"
-    prompt+="%F{magenta}%#%f "
-    PS1="$prompt"
+    prompt+="%B%F{magenta}${state}%f%b "
+    PS1=$prompt
     zle reset-prompt
 }
 zle -N zle-line-init
@@ -57,38 +69,52 @@ preexec() {
 }
 
 precmd() {
-    print -n "\a"
-}
-# }}}
-
-# Tmux pane name {{{
-CTP()
-{
-    printf "\033]2;\033\\"
+    printf "\a\033]2;\033\\"
 }
-CTP
 # }}}
 
 # Aliases {{{
 alias l="ls -AF "
-alias ll="ls -AFl "
-alias ssh="TERM=xterm ssh"
+alias ll="ls -D %Y-%m-%d -AFl "
 alias vi="vim"
-alias more="less"
 alias m="less "
 alias -g M="| less"
-alias mc="mc --nomouse ; CTP"
-bindkey -s "OS" " popd\n" # F4
+alias -g W="| wc -l | sed 's/ //g'"
+alias -g T="| tai64nlocal"
+alias mc="mc --nomouse"
 
 f() {
-    # find . -name "*$1*" -print
-    print -C 1 **$1*
+    bfs . -name "*$1*" -print
 }
 
+alias ssh="TERM=xterm ssh"
+alias sshnm="ssh -S none"
 ssht() {
-    ssh -C -t "$1" tmux attach -t0
+    local t="-t 0"
+    TERM=xterm ssh -C -t $1 "tmux has-session $t && tmux attach-session $t || tmux new-session $t"
+}
+
+autoload -U zsh-mime-setup ; zsh-mime-setup
+alias -s html=lynx
+
+autoload -U zmv
+# }}}
+
+# Faster movement {{{
+cddotdot() {
+    cd ..
+    pwd
+    zle reset-prompt
+}
+zle -N cddotdot
+bindkey "OQ" cddotdot # F2
+
+popdquiet() {
+    popd
+    zle reset-prompt
 }
-alias sshnm='ssh -S none'
+zle -N popdquiet
+bindkey "OS" popdquiet # F4
 # }}}
 
 # Git {{{
@@ -96,44 +122,35 @@ alias Ga="git add"
 alias Gb="git branch"
 alias Gc="git checkout"
 alias Gd="git diff"
-alias Gs="git show"
-alias Gm="git diff --name-only --diff-filter=M"
+alias Gdc="git diff --cached"
+alias Gs="git show --show-signature"
+alias Gm="git diff --name-only --diff-filter=M --relative"
 alias Gam="git commit --amend"
-alias -g W="| wc -l"
-
-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 'e ++enc=utf8' -"
-alias Grpck="git gc --prune=now ; git repack -a -d --depth=4095 --window=10240"
+alias Gl="git log --oneline --graph --decorate=short"
+alias Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'"
 
-bindkey -s "OQ" " git status\n" # F2
 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}
-}
-GS() {
-    $GREP ${=GREP_ARGS} $@ | sort --numeric-sort | ${=LESS_COLORED}
+    grep $GREP_ARGS $@ | 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 {{{
@@ -142,25 +159,51 @@ 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"
-# }}}
-
-
 # Completion {{{
+zstyle ":completion:*" list-colors ""
+
 zstyle ":completion:*:functions" ignored-patterns "_*"
-zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
+zstyle ":completion:*:manuals" separate-sections true
+
+zstyle ":completion:*" group-name ""
+zstyle ":completion:*:messages" format "%d"
+zstyle ":completion:*:warnings" format "%F{red}no matches: %d%f"
+zstyle ":completion:*:*:*:*:descriptions" format "%B... %d%b"
+zstyle ":completion:*:files:*:*:descriptions" format ""
+
+zstyle ":completion:*" file-patterns "%p:globbed" "*"
+zstyle ":completion:*" matcher-list "" "m:{a-z-}={A-Z_}" "r:|?=** m:{a-z-}={A-Z_}"
+zstyle ":completion:*:man:*:*:*" matcher-list "" "m:{a-zA-Z}={A-Za-z} l:|=* r:|=*"
+zstyle ":completion:*" completer _mycomp _mycomp_man:man _parameters _ignored
+
 _mycomp () {
-    [ $CURRENT -eq 1 ] && _command_names || _files
+    [[ $CURRENT -eq 1 ]] && curcontext="${curcontext%:*:*}:-command-:" \
+        _command_names && return
+    [[ $IPREFIX =~ ~.* ]] && _tilde && return
+    local has_files
+    curcontext=:files:${curcontext#:*:} _files && has_files=1
+    [[ $has_files ]] && return
+
+    # MAGIC_EQUAL_SUBST {{{
+    [[ $PREFIX = *\=* ]] || return 1
+    compstate[parameter]=${PREFIX%%\=*}
+    compset -P 1 "*="
+    _value
+    # }}}
 }
-zstyle ":completion:*" completer _mycomp _parameters
+
+_mycomp_man () {
+    [[ ${words[1]} == man ]] && curcontext=:man:${curcontext#:*:} \
+        _dispatch "" man man "" -default- && _value && return
+    [[ ${words[1]} == info ]] && curcontext=:info:${curcontext#:*:} \
+        _dispatch "" info info "" -default- && return
+}
+
 autoload -U compinit ; compinit -d /tmp/.zcompdump
-zstyle ":completion:*:default" list-colors ""
 autoload -U complist
 # }}}
 
@@ -168,15 +211,47 @@ 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=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[commandseparator]="fg=red"
 ZSH_HIGHLIGHT_STYLES[redirection]="fg=red"
-ZSH_HIGHLIGHT_STYLES[assign]="fg=cyan"
+ZSH_HIGHLIGHT_STYLES[path]="fg=white,underline"
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]="fg=white,bold,underline"
 # }}}
 
 # Autosuggestion {{{
 . ~/work/zsh-autosuggestions/zsh-autosuggestions.zsh
-ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=6"
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
+# }}}
+
+# fzf {{{
+cf() {
+    local dir=$(bfs -L ${1:-.} -mindepth 1 \
+        -path "*/\.git" -prune -o \
+        -path "*/\.redo" -prune -o \
+        -type d -print 2>/dev/null |
+            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
 # }}}
 
+# Virtualenv {{{
+venv() {
+    . /usr/local/bin/virtualenvwrapper.sh
+}
+# }}}
+
+# autoenv {{{
+. ~/work/zsh-autoenv/autoenv.zsh
+# }}}