Fix popd-related function name

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 778759a9695789328f15cd2cebb14178e412dae2..62390a09565ba4a13fd200cba7b02eb36f3e9319 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -83,7 +83,6 @@ 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
@@ -105,12 +104,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 {{{
@@ -122,11 +121,8 @@ 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"
-
 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
 # }}}
@@ -153,8 +149,7 @@ alias gg="git grep "
 # }}}
 
 # GPG agent {{{
-GPG_TTY=$(tty)
-export GPG_TTY
+export GPG_TTY=$(tty)
 # }}}
 
 # Virtualenv {{{
@@ -169,6 +164,7 @@ mailpath=(
     ~/mail/arbeit"?Neue Nachrichten in =arbeit"
 )
 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
 # }}}
 
@@ -215,9 +211,9 @@ 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 |
+    local dir=$(find -L ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
         fzf --height 40% --reverse --preview="tree -CN {}")
-    [[ -z $dir ]] || cd $dir
+    [[ -z $dir ]] || { print -s cd $dir ; cd $dir }
 }
 # }}}