Highlight assignments differently from suggestions

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index ef56e6820fea2b010cb2bd77258d1f5fa1a296a3..d5f2b74be84240facb9a6297bac706a3459646fa 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -97,13 +97,14 @@ alias sshnm="ssh -S none"
 # Faster movement {{{
 cddotdot() {
     cd ..
+    pwd
     zle reset-prompt
 }
 zle -N cddotdot
 bindkey "\eOQ" cddotdot # F2
 
 pushdquiet() {
-    popd >/dev/null
+    popd
     zle reset-prompt
 }
 zle -N pushdquiet
@@ -115,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"
 
@@ -129,7 +131,7 @@ 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}
@@ -164,7 +166,7 @@ bindkey -s "\eOP" " inc\n" # F1
 
 # Calculator {{{
 autoload -U zcalc
-alias zc="zcalc"
+alias zc="zcalc -r4"
 # }}}
 
 # Named directories {{{
@@ -194,11 +196,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"