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

diff --git a/zsh/.zshrc b/zsh/.zshrc
index c0cd9ee..0756acc 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -35,6 +35,8 @@ 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-pattern-search-backward
+
+HISTORY_IGNORE="(yt* *|t *|t|mmfileget *)"
 # }}}
 
 # Prompt {{{
@@ -80,7 +82,7 @@ f() {
 ssht() {
     ssh -C -t "$1" tmux attach -t0
 }
-alias sshnm='ssh -S none'
+alias sshnm="ssh -S none"
 # }}}
 
 # Git {{{
@@ -96,7 +98,7 @@ 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 Grr="git --no-pager log $git_common --graph -n 1024 | vi -c 'setlocal filetype=gitrebase buftype=nofile noswapfile' -"
 
 bindkey -s "OQ" " git status\n" # F2
 bindkey -s "OR" " git status --short\n" # F3
@@ -132,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 "OP" " inc\n" # F1
 # }}}
 
@@ -150,7 +152,8 @@ alias zc="zcalc"
 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 && return 0
+    [ "$words[1]" != "man" ] || { _man && return 0 }
+    [ $CURRENT -eq 1 ] && _command_names ||  _files && return 0
     # MAGIC_EQUAL_SUBST {{{
     [[ "$PREFIX" = *\=* ]] || return 1
     compstate[parameter]="${PREFIX%%\=*}"
@@ -168,15 +171,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"
 # }}}
-