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

diff --git a/zsh/.zshrc b/zsh/.zshrc
index a2a95d1..08beaf1 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -34,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 {{{
@@ -57,18 +59,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 "
@@ -77,7 +71,7 @@ alias vi="vim"
 alias more="less"
 alias m="less "
 alias -g M="| less"
-alias mc="mc --nomouse ; CTP"
+alias mc="mc --nomouse"
 bindkey -s "OS" " popd\n" # F4
 
 f() {
@@ -88,7 +82,7 @@ f() {
 ssht() {
     ssh -C -t "$1" tmux attach -t0
 }
-alias sshnm='ssh -S none'
+alias sshnm="ssh -S none"
 # }}}
 
 # Git {{{
@@ -104,8 +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 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 "OQ" " git status\n" # F2
 bindkey -s "OR" " git status --short\n" # F3
@@ -151,12 +144,21 @@ 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