X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=c0cd9ee1d4fa5bff1109dbd43deab9b47ddbfb65;hb=f8e58a97f77c2b20def769d6108270263ba929f6;hp=afd966782203ba34275bc0e8ea3d8db21af48fc6;hpb=cf3bcc8287ea9e52292e7a2bf63d4dcc75d47231;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index afd9667..c0cd9ee 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 {{{
@@ -54,18 +57,10 @@ preexec() {
 }
 
 precmd() {
-    print -n "\a"
+    printf "\a\033]2;\033\\"
 }
 # }}}
 
-# Tmux pane name {{{
-CTP()
-{
-    printf "\033]2;\033\\"
-}
-CTP
-# }}}
-
 # Aliases {{{
 alias l="ls -AF "
 alias ll="ls -AFl "
@@ -74,7 +69,7 @@ alias vi="vim"
 alias more="less"
 alias m="less "
 alias -g M="| less"
-alias mc="mc ; CTP"
+alias mc="mc --nomouse"
 bindkey -s "OS" " popd\n" # F4
 
 f() {
@@ -85,17 +80,7 @@ f() {
 ssht() {
     ssh -C -t "$1" tmux attach -t0
 }
-alias sshnm='ssh -o "ControlMaster no"'
-# }}}
-
-# Lynx {{{
-lwe() {
-    lynx -cookies "https://en.wikipedia.org/wiki/$1"
-}
-
-lwr() {
-    lynx -cookies "https://ru.wikipedia.org/wiki/$1"
-}
+alias sshnm='ssh -S none'
 # }}}
 
 # Git {{{
@@ -106,12 +91,12 @@ 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"
 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"
 
 bindkey -s "OQ" " git status\n" # F2
 bindkey -s "OR" " git status --short\n" # F3
@@ -119,11 +104,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 "
 # }}}
 
@@ -153,43 +142,24 @@ autoload -U zcalc
 alias zc="zcalc"
 # }}}
 
-# Paths {{{
-export CFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib"
-
-export MANPATH=/usr/share/man
-export MANPATH=/usr/local/man:$MANPATH
-export MANPATH=/usr/local/share/man:$MANPATH
-export MANPATH=/usr/share/openssl/man:$MANPATH
-export MANPATH=/usr/local/lib/perl5/site_perl/man:$MANPATH
-export MANPATH=/usr/local/lib/perl5/5.26/perl/man:$MANPATH
-
-export PATH=$HOME/git/bin:$PATH
-export MANPATH=$HOME/git/share/man:$MANPATH
-
-# export PATH=$HOME/postgresql/bin:$PATH
-# export MANPATH=$HOME/postgresql/share/man:$MANPATH
-# [ -e ~/postgresql/lib/libpq.so.5 ] && export LD_PRELOAD=$HOME/postgresql/lib/libpq.so.5
-
-# export PATH=$HOME/texlive/2017/bin/amd64-freebsd:$PATH
-# export INFOPATH=/usr/local/share/info:$HOME/texlive/2017/texmf-dist/doc/info:$INFOPATH
-# export MANPATH=$HOME/texlive/2017/texmf-dist/doc/man:$MANPATH
-
-export PATH=$HOME/stow/bin:$PATH
-export MANPATH=$HOME/stow/share/man:$MANPATH
-export INFOPATH=$HOME/stow/share/info:$INFOPATH
+# 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
+    [ $CURRENT -eq 1 ] && _command_names || _files && return 0
+    # MAGIC_EQUAL_SUBST {{{
+    [[ "$PREFIX" = *\=* ]] || return 1
+    compstate[parameter]="${PREFIX%%\=*}"
+    compset -P 1 "*="
+    _value
+    # }}}
 }
 zstyle ":completion:*" completer _mycomp _parameters
-
 autoload -U compinit ; compinit -d /tmp/.zcompdump
-
 zstyle ":completion:*:default" list-colors ""
 autoload -U complist
 # }}}
@@ -210,4 +180,3 @@ ZSH_HIGHLIGHT_STYLES[assign]="fg=cyan"
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=6"
 # }}}
 
-~/bin/cleanup.sh