X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=45fd16407ce1bec84e3391034cfad38c4429f64f;hb=191a1bf7bbd5859393f96929a5a8e1d3c12bd9e2;hp=7af4ea4f951cec43a3ba20fbcbd9ff39796b828a;hpb=86d6e7cf6cb1a5c1bfa425bac671be4e8b970e86;p=dotfiles.git diff --git a/zsh/.zshrc b/zsh/.zshrc index 7af4ea4..45fd164 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -104,12 +104,12 @@ cddotdot() { zle -N cddotdot bindkey "OQ" cddotdot # F2 -pushdquiet() { +popdquiet() { popd zle reset-prompt } -zle -N pushdquiet -bindkey "OS" pushdquiet # F4 +zle -N popdquiet +bindkey "OS" popdquiet # F4 # }}} # Git {{{ @@ -121,7 +121,6 @@ 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'" @@ -150,8 +149,7 @@ alias gg="git grep " # }}} # GPG agent {{{ -GPG_TTY=$(tty) -export GPG_TTY +export GPG_TTY=$(tty) # }}} # Virtualenv {{{ @@ -175,7 +173,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%%\=*}