X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=f41da1de4d700475307d2b998eab6c679c7656c5;hb=d76427bfbf9a9cf116b42ed93be872f1003dfa86;hp=b3c8d6c7422435ab09737575b6f7bf5c9d1929a8;hpb=5ccc892890685611013aa8011d2378f0828d5cac;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index b3c8d6c..f41da1d 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -13,7 +13,7 @@ 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)"
+HISTORY_IGNORE="(yt* *|t *|t|sdcv *|mmfileget *|arr|rss)"
 # }}}
 
 # Vi mode {{{
@@ -82,7 +82,8 @@ alias m="less "
 alias -g M="| less"
 alias -g W="| wc -l"
 alias mc="mc --nomouse"
-bindkey -s "OS" " popd\n" # F4
+alias sent="mutt -f =sent-\`date '+%y-%m'\`"
+alias zc=~/bin/dc-wrapped.sh
 
 f() {
     # find . -name "*$1*" -print
@@ -95,27 +96,43 @@ ssht() {
 alias sshnm="ssh -S none"
 # }}}
 
+# Faster movement {{{
+cddotdot() {
+    cd ..
+    pwd
+    zle reset-prompt
+}
+zle -N cddotdot
+bindkey "OQ" cddotdot # F2
+
+pushdquiet() {
+    popd
+    zle reset-prompt
+}
+zle -N pushdquiet
+bindkey "OS" 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"
 
-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' -"
+alias Gl="git log --oneline --graph --decorate=short"
+alias Gr="git --no-pager log --oneline -n 20 | perl -ne 'print \"@~\$n \$_\"; \$n++'"
+alias Grr="git --no-pager log --oneline --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
 # }}}
 
 # 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}
@@ -148,11 +165,6 @@ alias rss="mutt -f \=rss"
 bindkey -s "OP" " inc\n" # F1
 # }}}
 
-# Calculator {{{
-autoload -U zcalc
-alias zc="zcalc"
-# }}}
-
 # Named directories {{{
 . ~/.zhashd
 # }}}
@@ -180,11 +192,12 @@ 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[assign]="fg=yellow"
 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[global-alias]="fg=yellow,bold"
 ZSH_HIGHLIGHT_STYLES[history-expansion]="fg=magenta"
 ZSH_HIGHLIGHT_STYLES[redirection]="fg=red"
 ZSH_HIGHLIGHT_STYLES[path]="fg=white,underline"