X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=62ec28c8439af6bc96fc9faf68a5dc074332749c;hb=a1e7673ba11fd8c5ce70444117a766e41d05ce22;hp=5e5d3e9dcddf8cb5f06570b936f3393a8f0dbe5b;hpb=b57e3c0a40b8694eb053f9b74d4a0675543ea885;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5e5d3e9..62ec28c 100644
--- 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)/-}"
@@ -89,6 +82,8 @@ alias m="less "
 alias -g M="| less"
 alias -g W="| wc -l"
 alias mc="mc --nomouse"
+alias sent="mutt -f =sent-\`date '+%y-%m'\`"
+alias zc=~/bin/dc-wrapped.sh
 
 f() {
     # find . -name "*$1*" -print
@@ -104,13 +99,14 @@ alias sshnm="ssh -S none"
 # Faster movement {{{
 cddotdot() {
     cd ..
+    pwd
     zle reset-prompt
 }
 zle -N cddotdot
 bindkey "OQ" cddotdot # F2
 
 pushdquiet() {
-    popd >/dev/null
+    popd
     zle reset-prompt
 }
 zle -N pushdquiet
@@ -122,21 +118,21 @@ 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 "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}
@@ -169,11 +165,6 @@ alias rss="mutt -f \=rss"
 bindkey -s "OP" " inc\n" # F1
 # }}}
 
-# Calculator {{{
-autoload -U zcalc
-alias zc="zcalc"
-# }}}
-
 # Named directories {{{
 . ~/.zhashd
 # }}}
@@ -201,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"