Updated zsh-syntax-highlighting

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 1ed44c692cb64679c52694261f1d8cf97ca217fb..4aa6a4ff9c01b87016eaa5bbfc87710b754ddf1e 100644 (file)
--- 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,9 @@ 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
+
+HISTORY_IGNORE="(yt* *|t *|t|mmfileget *)"
 # }}}
 
 # Prompt {{{
@@ -54,16 +59,8 @@ preexec() {
 }
 
 precmd() {
-    print -n "\a"
-}
-# }}}
-
-# Tmux pane name {{{
-CTP()
-{
-    printf "\033]2;\033\\"
+    printf "\a\033]2;\033\\"
 }
-CTP
 # }}}
 
 # Aliases {{{
@@ -74,7 +71,7 @@ alias vi="vim"
 alias more="less"
 alias m="less "
 alias -g M="| less"
-alias mc="mc ; CTP"
+alias mc="mc --nomouse"
 bindkey -s "\eOS" " popd\n" # F4
 
 f() {
@@ -85,7 +82,7 @@ f() {
 ssht() {
     ssh -C -t "$1" tmux attach -t0
 }
-alias sshnm='ssh -S none'
+alias sshnm="ssh -S none"
 # }}}
 
 # Git {{{
@@ -96,12 +93,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"
+alias Grr="git --no-pager log $git_common --graph -n 1024 | vi -c 'setlocal filetype=gitrebase buftype=nofile noswapfile' -"
 
 bindkey -s "\eOQ" " git status\n" # F2
 bindkey -s "\eOR" " git status --short\n" # F3
@@ -109,11 +106,15 @@ bindkey -s "\eOR" " 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 "
 # }}}
 
@@ -133,8 +134,8 @@ 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'"
+alias rss="mutt -f \=rss"
 bindkey -s "\eOP" " inc\n" # F1
 # }}}
 
@@ -143,18 +144,24 @@ 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
+    [ $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
 # }}}
@@ -163,15 +170,18 @@ 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=cyan"
+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[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"
 # }}}
-