X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=056f919104aebeeee3bb5d90d750be2f277b80e9;hb=77477f33ca2ff1a77a5071d9966534f9920e902e;hp=e50ce267c6f8a3ad9ffc2285fb0de72654c59548;hpb=4f932d6aa0ba8cd7e1153f965a0f84d065b03b2d;p=dotfiles.git diff --git a/zsh/.zshrc b/zsh/.zshrc index e50ce26..056f919 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -7,6 +7,9 @@ setopt INTERACTIVE_COMMENTS setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB setopt NO_NOMATCH setopt AUTO_PUSHD PUSHD_IGNORE_DUPS + +setopt RM_STAR_SILENT +export LISTMAX=9999 # }}} # Vi mode {{{ @@ -31,7 +34,7 @@ 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 +bindkey "^R" history-incremental-pattern-search-backward # }}} # Prompt {{{ @@ -74,7 +77,7 @@ alias vi="vim" alias more="less" alias m="less " alias -g M="| less" -alias mc="mc ; CTP" +alias mc="mc --nomouse ; CTP" bindkey -s "OS" " popd\n" # F4 f() { @@ -88,16 +91,6 @@ ssht() { alias sshnm='ssh -S none' # }}} -# Lynx {{{ -lwe() { - lynx -cookies "https://en.wikipedia.org/wiki/$1" -} - -lwr() { - lynx -cookies "https://ru.wikipedia.org/wiki/$1" -} -# }}} - # Git {{{ alias Ga="git add" alias Gb="git branch" @@ -106,6 +99,7 @@ alias Gd="git diff" alias Gs="git show" 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" @@ -119,11 +113,15 @@ 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" g() { - $GREP --color=always --with-filename --line-number --recursive $@ | less --RAW-CONTROL-CHARS + $GREP ${=GREP_ARGS} $@ | ${=LESS_COLORED} +} +GS() { + $GREP ${=GREP_ARGS} $@ | sort --numeric-sort | ${=LESS_COLORED} } alias -g G="| $GREP --color" -alias grep="$GREP" alias gg="git grep " # }}} @@ -157,14 +155,11 @@ alias zc="zcalc" # 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 } zstyle ":completion:*" completer _mycomp _parameters - autoload -U compinit ; compinit -d /tmp/.zcompdump - zstyle ":completion:*:default" list-colors "" autoload -U complist # }}}