Use RPN with zcalc

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4aa6a4ff9c01b87016eaa5bbfc87710b754ddf1e..68b50e8a3f8f098f7b289c75042b47e173721e0f 100644 (file)
--- 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 "\eOS" " popd\n" # F4
 
 f() {
     # find . -name "*$1*" -print
@@ -85,28 +94,44 @@ ssht() {
 alias sshnm="ssh -S none"
 # }}}
 
+# Faster movement {{{
+cddotdot() {
+    cd ..
+    pwd
+    zle reset-prompt
+}
+zle -N cddotdot
+bindkey "\eOQ" cddotdot # F2
+
+pushdquiet() {
+    popd
+    zle reset-prompt
+}
+zle -N pushdquiet
+bindkey "\eOS" pushdquiet # F4
+# }}}
+
 # Git {{{
 alias Ga="git add"
 alias Gb="git branch"
 alias Gc="git checkout"
 alias Gd="git diff"
-alias Gs="git show"
+alias Gdc="git diff --cached"
+alias Gs="git show --show-signature"
 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 "\eOQ" " git status\n" # F2
 bindkey -s "\eOR" " git status --short\n" # F3
 # }}}
 
 # grep {{{
 GREP=/usr/local/bin/grep
-GREP_ARGS="--color=always --with-filename --line-number --recursive"
+GREP_ARGS="--color=always --with-filename --line-number --dereference-recursive"
 LESS_COLORED="less --RAW-CONTROL-CHARS"
 g() {
     $GREP ${=GREP_ARGS} $@ | ${=LESS_COLORED}
@@ -141,7 +166,7 @@ bindkey -s "\eOP" " inc\n" # F1
 
 # Calculator {{{
 autoload -U zcalc
-alias zc="zcalc"
+alias zc="zcalc -r4"
 # }}}
 
 # Named directories {{{
@@ -152,7 +177,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%%\=*}"