X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=a2a95d18e61f4b9c7b18fd29a9a3e4c84776d613;hb=2fc4ee6fa72badb10e73c949f697f0e41a859d27;hp=7dcc18fe8189b791185246b0d6902116be750023;hpb=0af19309dadb67e1cad309475e580a6311a45f34;p=dotfiles.git diff --git a/zsh/.zshrc b/zsh/.zshrc index 7dcc18f..a2a95d1 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 {{{ @@ -96,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" @@ -109,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 " # }}} @@ -147,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 # }}}