Gm must be useful in non git root

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 778759a9695789328f15cd2cebb14178e412dae2..a42a351d2b21c8f1aa9a08c1c5045e2688ce2aa2 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,7 +1,6 @@
 # vim: foldmethod=marker:foldlevel=0
 
 # Basic options {{{
-setopt INTERACTIVE_COMMENTS
 setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
 setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
@@ -23,8 +22,8 @@ export KEYTIMEOUT=1
 # }}}
 
 # Home/end {{{
-bindkey "^[[1~" beginning-of-line
-bindkey "^[[4~" end-of-line
+bindkey "^[[1~" beginning-of-line # Home
+bindkey "^[[4~" end-of-line # End
 # }}}
 
 # Command-line editing {{{
@@ -51,13 +50,13 @@ 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 ))
-    prompt="%2~|"
-    prompt+="%U${timer_show}%u|"
+    local state="%#" timer_val="?"
+    [[ ${KEYMAP} == vicmd ]] && state="+"
+    [[ $timer ]] && timer_val=$(( $SECONDS - $timer ))
+    prompt="%2~ "
+    prompt+="%U${timer_val}%u|"
     prompt+="%B%?%b"
-    prompt+="${mode_vi}"
-    prompt+="%B%F{magenta}%#%f%b "
+    prompt+="%B%F{magenta}${state}%f%b "
     PS1=$prompt
     zle reset-prompt
 }
@@ -76,24 +75,21 @@ precmd() {
 # Aliases {{{
 alias l="ls -AF "
 alias ll="ls -AFl "
-alias ssh="TERM=xterm ssh"
 alias vi="vim"
-alias more="less"
 alias m="less "
 alias -g M="| less"
 alias -g W="| wc -l | sed 's/ //g'"
 alias mc="mc --nomouse"
-alias sent="mutt -f =sent-\`date '+%y-%m'\`"
 
 f() {
-    # find . -name "*$1*" -print
-    print -C 1 **$1*
+    bfs . -name "*$1*" -print
 }
 
+alias ssh="TERM=xterm ssh"
+alias sshnm="ssh -S none"
 ssht() {
     ssh -C -t $1 tmux attach -t0
 }
-alias sshnm="ssh -S none"
 # }}}
 
 # Faster movement {{{
@@ -105,12 +101,12 @@ cddotdot() {
 zle -N cddotdot
 bindkey "\eOQ" cddotdot # F2
 
-pushdquiet() {
+popdquiet() {
     popd
     zle reset-prompt
 }
-zle -N pushdquiet
-bindkey "\eOS" pushdquiet # F4
+zle -N popdquiet
+bindkey "\eOS" popdquiet # F4
 # }}}
 
 # Git {{{
@@ -120,13 +116,10 @@ alias Gc="git checkout"
 alias Gd="git diff"
 alias Gdc="git diff --cached"
 alias Gs="git show --show-signature"
-alias Gm="git diff --name-only --diff-filter=M"
+alias Gm="git diff --name-only --diff-filter=M --relative"
 alias Gam="git commit --amend"
-
 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 "\eOR" " git status --short\n" # F3
 # }}}
@@ -141,26 +134,15 @@ GREP_ARGS=(
     --exclude-dir=.git
     --exclude-dir=.tags
 )
-LESS_COLOURED=(less --RAW-CONTROL-CHARS)
 g() {
-    grep $GREP_ARGS $@ | $LESS_COLOURED
-}
-GS() {
-    grep $GREP_ARGS $@ | sort --numeric-sort | $LESS_COLOURED
+    grep $GREP_ARGS $@ | less
 }
 alias -g G="| grep --colour=always"
 alias gg="git grep "
 # }}}
 
 # GPG agent {{{
-GPG_TTY=$(tty)
-export GPG_TTY
-# }}}
-
-# Virtualenv {{{
-venv() {
-    . /usr/local/bin/virtualenvwrapper.sh
-}
+export GPG_TTY=$(tty)
 # }}}
 
 # Mail {{{
@@ -168,7 +150,8 @@ mailpath=(
     ~/mail/mbox"?Neue Nachrichten in =mbox"
     ~/mail/arbeit"?Neue Nachrichten in =arbeit"
 )
-alias arr="mutt -f \=arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
+alias arr="mutt -f =arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
+alias sent="mutt -f =sent-\`date '+%y-%m'\`"
 bindkey -s "\eOP" " inc\n" # F1
 # }}}
 
@@ -177,7 +160,7 @@ 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
+    [[ $CURRENT -eq 1 ]] && _command_names || _files && return 0
     # MAGIC_EQUAL_SUBST {{{
     [[ $PREFIX = *\=* ]] || return 1
     compstate[parameter]=${PREFIX%%\=*}
@@ -213,11 +196,13 @@ 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
+    local dir=$(bfs -L ${1:-.} -mindepth 1 \
+        -path "*/\.git" -prune -o \
+        -path "*/\.redo" -prune -o \
+        -type d -print 2>/dev/null |
+            fzf --height 40% --reverse --preview="tree -CN {}")
+    [[ -z $dir ]] || { print -s cd $dir ; cd $dir }
 }
 # }}}
 
@@ -229,6 +214,11 @@ done < ~/.zhashd
 # }}}
 
 # autoenv {{{
-export AUTOENV_AUTH_FILE=~/.zautoenv-auth
 . ~/work/zsh-autoenv/autoenv.zsh
 # }}}
+
+# Virtualenv {{{
+venv() {
+    . /usr/local/bin/virtualenvwrapper.sh
+}
+# }}}