X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=blobdiff_plain;f=zsh%2F.zshrc;h=b0c5e6a3c39af07fcc79d5a69a127cc33739248c;hp=c75045f70ef55b767d4b66b53d3b71a451cbc489;hb=48338303d760027e62bab963fa11a940bc0d97eb;hpb=bc6788183c8c062df7ea148f588c024288c27344

diff --git a/zsh/.zshrc b/zsh/.zshrc
index c75045f..b0c5e6a 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 {{{
@@ -40,7 +41,7 @@ bindkey "^[[A" history-beginning-search-backward-end
 bindkey "^[[B" history-beginning-search-forward-end
 
 beginning-history-incremental-pattern-search-backward() {
-    zle history-incremental-pattern-search-backward $(echo $BUFFER | sed "s/ /*/g")
+    zle history-incremental-pattern-search-backward ${BUFFER:gs/ /*/}
 }
 zle -N beginning-history-incremental-pattern-search-backward
 bindkey "^[[1;2A" beginning-history-incremental-pattern-search-backward
@@ -50,14 +51,14 @@ bindkey -M isearch "^[[B" history-incremental-pattern-search-forward
 
 # Prompt {{{
 function zle-line-init zle-keymap-select {
-    mode_vi="${${KEYMAP/vicmd/+}/(main|viins)/-}"
-    [ $timer ] && timer_show=$(( $SECONDS - $timer ))
+    mode_vi=${${KEYMAP/vicmd/+}/(main|viins)/-}
+    [[ $timer ]] && timer_show=$(( $SECONDS - $timer ))
     prompt="%2~|"
     prompt+="%U${timer_show}%u|"
     prompt+="%B%?%b"
     prompt+="${mode_vi}"
     prompt+="%B%F{magenta}%#%f%b "
-    PS1="$prompt"
+    PS1=$prompt
     zle reset-prompt
 }
 zle -N zle-line-init
@@ -83,7 +84,7 @@ alias -g M="| less"
 alias -g W="| wc -l"
 alias mc="mc --nomouse"
 alias sent="mutt -f =sent-\`date '+%y-%m'\`"
-alias zc="rlwrap -S '> ' dc"
+alias zc=~/bin/dc-wrapped.sh
 
 f() {
     # find . -name "*$1*" -print
@@ -91,7 +92,7 @@ f() {
 }
 
 ssht() {
-    ssh -C -t "$1" tmux attach -t0
+    ssh -C -t $1 tmux attach -t0
 }
 alias sshnm="ssh -S none"
 # }}}
@@ -123,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
 # }}}
@@ -162,7 +163,6 @@ 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
 # }}}
 
@@ -174,11 +174,11 @@ bindkey -s "OP" " inc\n" # F1
 zstyle ":completion:*:functions" ignored-patterns "_*"
 zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
 _mycomp () {
-    [ "$words[1]" != "man" ] || { _man && return 0 }
-    [ $CURRENT -eq 1 ] && _command_names ||  _files && return 0
+    [[ ${words[1]} != man ]] || { _man && return 0 }
+    [[ $CURRENT -eq 1 ]] && _command_names ||  _files && return 0
     # MAGIC_EQUAL_SUBST {{{
-    [[ "$PREFIX" = *\=* ]] || return 1
-    compstate[parameter]="${PREFIX%%\=*}"
+    [[ $PREFIX = *\=* ]] || return 1
+    compstate[parameter]=${PREFIX%%\=*}
     compset -P 1 "*="
     _value
     # }}}
@@ -209,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:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
+        fzf --height 40% --reverse --preview="tree -CN {}")
+    [[ -z $dir ]] || cd $dir
+}
+# }}}