X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=ef56e6820fea2b010cb2bd77258d1f5fa1a296a3;hb=24ffbdb7c8444e77a513878d515fc5c8c57df29b;hp=4aa6a4ff9c01b87016eaa5bbfc87710b754ddf1e;hpb=dcaa3ab22a8ab251abf792f626da4f6bbd37622a;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4aa6a4f..ef56e68 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,8 +1,6 @@
 # vim: foldmethod=marker:foldlevel=0
 
 # Basic options {{{
-setopt APPEND_HISTORY SHARE_HISTORY INC_APPEND_HISTORY HIST_IGNORE_ALL_DUPS
-setopt HIST_IGNORE_SPACE
 setopt INTERACTIVE_COMMENTS
 setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
@@ -12,6 +10,12 @@ setopt RM_STAR_SILENT
 export LISTMAX=9999
 # }}}
 
+# History options {{{
+setopt APPEND_HISTORY SHARE_HISTORY INC_APPEND_HISTORY HIST_IGNORE_ALL_DUPS
+setopt HIST_IGNORE_SPACE
+HISTORY_IGNORE="(yt* *|t *|t|mmfileget *|arr|rss)"
+# }}}
+
 # Vi mode {{{
 bindkey -v
 export KEYTIMEOUT=1
@@ -34,9 +38,14 @@ 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-pattern-search-backward
 
-HISTORY_IGNORE="(yt* *|t *|t|mmfileget *)"
+beginning-history-incremental-pattern-search-backward() {
+    zle history-incremental-pattern-search-backward $(echo $BUFFER | sed "s/ /*/g")
+}
+zle -N beginning-history-incremental-pattern-search-backward
+bindkey "^[[1;2A" beginning-history-incremental-pattern-search-backward
+bindkey -M isearch "^[[A" history-incremental-pattern-search-backward
+bindkey -M isearch "^[[B" history-incremental-pattern-search-forward
 # }}}
 
 # Prompt {{{
@@ -47,7 +56,7 @@ function zle-line-init zle-keymap-select {
     prompt+="%U${timer_show}%u|"
     prompt+="%B%?%b"
     prompt+="${mode_vi}"
-    prompt+="%F{magenta}%#%f "
+    prompt+="%B%F{magenta}%#%f%b "
     PS1="$prompt"
     zle reset-prompt
 }
@@ -71,8 +80,8 @@ alias vi="vim"
 alias more="less"
 alias m="less "
 alias -g M="| less"
+alias -g W="| wc -l"
 alias mc="mc --nomouse"
-bindkey -s "OS" " popd\n" # F4
 
 f() {
     # find . -name "*$1*" -print
@@ -85,6 +94,22 @@ ssht() {
 alias sshnm="ssh -S none"
 # }}}
 
+# Faster movement {{{
+cddotdot() {
+    cd ..
+    zle reset-prompt
+}
+zle -N cddotdot
+bindkey "OQ" cddotdot # F2
+
+pushdquiet() {
+    popd >/dev/null
+    zle reset-prompt
+}
+zle -N pushdquiet
+bindkey "OS" pushdquiet # F4
+# }}}
+
 # Git {{{
 alias Ga="git add"
 alias Gb="git branch"
@@ -93,14 +118,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 'setlocal filetype=gitrebase buftype=nofile noswapfile' -"
 
-bindkey -s "OQ" " git status\n" # F2
 bindkey -s "OR" " git status --short\n" # F3
 # }}}
 
@@ -152,7 +175,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%%\=*}"