Use RPN with zcalc

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index e5dcfaa5b2838714c87a4ed300fdd966ed14b622..68b50e8a3f8f098f7b289c75042b47e173721e0f 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -48,13 +48,6 @@ bindkey -M isearch "^[[A" history-incremental-pattern-search-backward
 bindkey -M isearch "^[[B" history-incremental-pattern-search-forward
 # }}}
 
-# URL quoting {{{
-autoload -U url-quote-magic
-autoload -U bracketed-paste-magic
-zle -N self-insert url-quote-magic
-zle -N bracketed-paste bracketed-paste-magic
-# }}}
-
 # Prompt {{{
 function zle-line-init zle-keymap-select {
     mode_vi="${${KEYMAP/vicmd/+}/(main|viins)/-}"
@@ -102,19 +95,20 @@ alias sshnm="ssh -S none"
 # }}}
 
 # Faster movement {{{
-pushdquiet() {
-    popd >/dev/null
-    zle reset-prompt
-}
-zle -N pushdquiet
-bindkey "\eOR" pushdquiet # F3
-
 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 {{{
@@ -122,7 +116,8 @@ 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"
 
@@ -131,13 +126,12 @@ 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 "\e[15~" " git status\n" # F5
-bindkey -s "\e[17~" " git status --short\n" # F6
+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}
@@ -172,7 +166,7 @@ bindkey -s "\eOP" " inc\n" # F1
 
 # Calculator {{{
 autoload -U zcalc
-alias zc="zcalc"
+alias zc="zcalc -r4"
 # }}}
 
 # Named directories {{{