X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=blobdiff_plain;f=zsh%2F.zshrc;h=b0c5e6a3c39af07fcc79d5a69a127cc33739248c;hp=1ac279d53cf5df6a3bbeac7808e49db82c396301;hb=48338303d760027e62bab963fa11a940bc0d97eb;hpb=0e9bcefa3fd79bc412b883203459914e8d37e8ca diff --git a/zsh/.zshrc b/zsh/.zshrc index 1ac279d..b0c5e6a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,17 +1,22 @@ # 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 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 @@ -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-pattern-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 )) + 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+="%F{magenta}%#%f " - PS1="$prompt" + prompt+="%B%F{magenta}%#%f%b " + PS1=$prompt zle reset-prompt } zle -N zle-line-init @@ -69,8 +81,10 @@ alias vi="vim" alias more="less" alias m="less " alias -g M="| less" +alias -g W="| wc -l" alias mc="mc --nomouse" -bindkey -s "OS" " popd\n" # F4 +alias sent="mutt -f =sent-\`date '+%y-%m'\`" +alias zc=~/bin/dc-wrapped.sh f() { # find . -name "*$1*" -print @@ -78,9 +92,26 @@ f() { } ssht() { - ssh -C -t "$1" tmux attach -t0 + ssh -C -t $1 tmux attach -t0 +} +alias sshnm="ssh -S none" +# }}} + +# Faster movement {{{ +cddotdot() { + cd .. + pwd + zle reset-prompt +} +zle -N cddotdot +bindkey "OQ" cddotdot # F2 + +pushdquiet() { + popd + zle reset-prompt } -alias sshnm='ssh -S none' +zle -N pushdquiet +bindkey "OS" pushdquiet # F4 # }}} # Git {{{ @@ -88,23 +119,22 @@ 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" -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 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 "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" +GREP_ARGS="--color=always --with-filename --line-number --dereference-recursive" LESS_COLORED="less --RAW-CONTROL-CHARS" g() { $GREP ${=GREP_ARGS} $@ | ${=LESS_COLORED} @@ -132,25 +162,23 @@ mailpath=( ~/mail/mbox"?Neue Nachrichten in =mbox" ~/mail/arbeit"?Neue Nachrichten in =arbeit" ) -alias arr="mutt -f =arbeit -e 'source ~/.mutt/accounts/stcnet.ru'" -alias rss="mutt -f =rss" +alias arr="mutt -f \=arbeit -e 'source ~/.mutt/accounts/stcnet.ru'" 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 () { - [ $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 # }}} @@ -165,15 +193,28 @@ 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 {{{ +export FZF_DEFAULT_OPTS="--color=16 --info=inline" +cf() { + local dir=$(find ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print | + fzf --height 40% --reverse --preview="tree -CN {}") + [[ -z $dir ]] || cd $dir +} +# }}}