X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=387f852f7dca9ef012c07f50bc9079a5e2054db1;hb=f3dc6d0d24f814b8aadf7e6b73e3c188e2dfa883;hp=a40386c91ac74cec4aebb537d84c5d27c67f2955;hpb=1d77d6f2997bd5adfae9a9b9c139b17d090cfdbd;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index a40386c..387f852 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -5,6 +5,7 @@ setopt INTERACTIVE_COMMENTS
 setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
 setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
+setopt PIPE_FAIL
 
 setopt RM_STAR_SILENT
 export LISTMAX=9999
@@ -13,7 +14,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)"
 # }}}
 
 # Vi mode {{{
@@ -82,6 +83,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
@@ -121,10 +124,10 @@ 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 Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'"
+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
 # }}}
@@ -160,15 +163,9 @@ mailpath=(
     ~/mail/arbeit"?Neue Nachrichten in =arbeit"
 )
 alias arr="mutt -f \=arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
-alias rss="mutt -f \=rss"
 bindkey -s "OP" " inc\n" # F1
 # }}}
 
-# Calculator {{{
-autoload -U zcalc
-alias zc="zcalc -r4"
-# }}}
-
 # Named directories {{{
 . ~/.zhashd
 # }}}
@@ -196,7 +193,7 @@ 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"
@@ -212,3 +209,12 @@ ZSH_HIGHLIGHT_STYLES[path_pathseparator]="fg=white,bold,underline"
 . ~/work/zsh-autosuggestions/zsh-autosuggestions.zsh
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
 # }}}
+
+# fzf {{{
+export FZF_DEFAULT_OPTS="--color=16 --info=inline"
+cf() {
+    local dir=$(find ${1:-.} -path "*/\.git" -prune -o -type d -print |
+        fzf --height 40% --reverse --preview="tree -CN {}")
+    [[ -z "$dir" ]] || cd "$dir"
+}
+# }}}