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

diff --git a/zsh/.zshrc b/zsh/.zshrc
index ebfb44f..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 {{{
@@ -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() {
@@ -85,17 +88,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,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 "
 # }}}
 
@@ -153,40 +151,15 @@ 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=$MANPATH:/usr/local/man
-export MANPATH=$MANPATH:/usr/local/share/man
-export MANPATH=$MANPATH:/usr/share/openssl/man
-export MANPATH=$MANPATH:/usr/local/lib/perl5/site_perl/man
-export MANPATH=$MANPATH:/usr/local/lib/perl5/5.26/perl/man
-
-export PATH=$PATH:$HOME/git/bin
-export MANPATH=$MANPATH:$HOME/git/share/man
-
-export PATH=$PATH:$HOME/postgresql/bin
-export MANPATH=$MANPATH:$HOME/postgresql/share/man
-
-export PATH=$HOME/texlive/2017/bin/amd64-freebsd:$PATH
-export INFOPATH=$INFOPATH:/usr/local/share/info:$HOME/texlive/2017/texmf-dist/doc/info
-export MANPATH=$MANPATH:$HOME/texlive/2017/texmf-dist/doc/man
-
-[ -e ~/postgresql/lib/libpq.so.5 ] && export LD_PRELOAD=$HOME/postgresql/lib/libpq.so.5
-# }}}
 
 # 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
 # }}}
@@ -207,4 +180,3 @@ ZSH_HIGHLIGHT_STYLES[assign]="fg=cyan"
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=6"
 # }}}
 
-~/bin/cleanup.sh