|
|
@ -10,38 +10,38 @@
|
|
|
|
# http://cl.ly/0Y3N0O2C3u1A1K3D3A00/screen.png
|
|
|
|
# http://cl.ly/0Y3N0O2C3u1A1K3D3A00/screen.png
|
|
|
|
#
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
|
|
function prompt_steeef_precmd() {
|
|
|
|
function prompt_paulmillr_precmd() {
|
|
|
|
if [[ -n "$__PROMPT_STEEEF_VCS_UPDATE" ]] ; then
|
|
|
|
if [[ -n "$__PROMPT_PAULMILLR_VCS_UPDATE" ]] ; then
|
|
|
|
# Check for untracked files or updated submodules since vcs_info doesn't.
|
|
|
|
# Check for untracked files or updated submodules since vcs_info doesn't.
|
|
|
|
if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
|
|
|
|
if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
|
|
|
|
__PROMPT_STEEEF_VCS_UPDATE=1
|
|
|
|
__PROMPT_PAULMILLR_VCS_UPDATE=1
|
|
|
|
fmt_branch="(${__PROMPT_STEEEF_COLORS[1]}%b%f%u%c${__PROMPT_STEEEF_COLORS[4]}!%f)"
|
|
|
|
fmt_branch="(${__PROMPT_PAULMILLR_COLORS[1]}%b%f%u%c${__PROMPT_PAULMILLR_COLORS[4]}!%f)"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
fmt_branch="(${__PROMPT_STEEEF_COLORS[1]}%b%f%u%c)"
|
|
|
|
fmt_branch="(${__PROMPT_PAULMILLR_COLORS[1]}%b%f%u%c)"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
zstyle ':vcs_info:*:prompt:*' formats "${fmt_branch}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' formats "${fmt_branch}"
|
|
|
|
|
|
|
|
|
|
|
|
vcs_info 'prompt'
|
|
|
|
vcs_info 'prompt'
|
|
|
|
__PROMPT_STEEEF_VCS_UPDATE=''
|
|
|
|
__PROMPT_PAULMILLR_VCS_UPDATE=''
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function prompt_steeef_preexec() {
|
|
|
|
function prompt_paulmillr_preexec() {
|
|
|
|
case "$(history $HISTCMD)" in
|
|
|
|
case "$(history $HISTCMD)" in
|
|
|
|
(*git*)
|
|
|
|
(*git*)
|
|
|
|
__PROMPT_STEEEF_VCS_UPDATE=1
|
|
|
|
__PROMPT_PAULMILLR_VCS_UPDATE=1
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
(*svn*)
|
|
|
|
(*svn*)
|
|
|
|
__PROMPT_STEEEF_VCS_UPDATE=1
|
|
|
|
__PROMPT_PAULMILLR_VCS_UPDATE=1
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function prompt_steeef_chpwd() {
|
|
|
|
function prompt_paulmillr_chpwd() {
|
|
|
|
__PROMPT_STEEEF_VCS_UPDATE=1
|
|
|
|
__PROMPT_PAULMILLR_VCS_UPDATE=1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function prompt_steeef_setup() {
|
|
|
|
function prompt_paulmillr_setup() {
|
|
|
|
setopt LOCAL_OPTIONS
|
|
|
|
setopt LOCAL_OPTIONS
|
|
|
|
unsetopt XTRACE KSH_ARRAYS
|
|
|
|
unsetopt XTRACE KSH_ARRAYS
|
|
|
|
prompt_opts=(cr percent subst)
|
|
|
|
prompt_opts=(cr percent subst)
|
|
|
@ -49,15 +49,15 @@ function prompt_steeef_setup() {
|
|
|
|
autoload -Uz add-zsh-hook
|
|
|
|
autoload -Uz add-zsh-hook
|
|
|
|
autoload -Uz vcs_info
|
|
|
|
autoload -Uz vcs_info
|
|
|
|
|
|
|
|
|
|
|
|
add-zsh-hook precmd prompt_steeef_precmd
|
|
|
|
add-zsh-hook precmd prompt_paulmillr_precmd
|
|
|
|
add-zsh-hook preexec prompt_steeef_preexec
|
|
|
|
add-zsh-hook preexec prompt_paulmillr_preexec
|
|
|
|
add-zsh-hook chpwd prompt_steeef_chpwd
|
|
|
|
add-zsh-hook chpwd prompt_paulmillr_chpwd
|
|
|
|
|
|
|
|
|
|
|
|
__PROMPT_STEEEF_VCS_UPDATE=1
|
|
|
|
__PROMPT_PAULMILLR_VCS_UPDATE=1
|
|
|
|
|
|
|
|
|
|
|
|
# Use extended color pallete if available.
|
|
|
|
# Use extended color pallete if available.
|
|
|
|
if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
|
|
|
|
if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
|
|
|
|
__PROMPT_STEEEF_COLORS=(
|
|
|
|
__PROMPT_PAULMILLR_COLORS=(
|
|
|
|
"%F{81}" # turquoise
|
|
|
|
"%F{81}" # turquoise
|
|
|
|
"%F{166}" # orange
|
|
|
|
"%F{166}" # orange
|
|
|
|
"%F{135}" # purple
|
|
|
|
"%F{135}" # purple
|
|
|
@ -65,7 +65,7 @@ function prompt_steeef_setup() {
|
|
|
|
"%F{118}" # limegreen
|
|
|
|
"%F{118}" # limegreen
|
|
|
|
)
|
|
|
|
)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
__PROMPT_STEEEF_COLORS=(
|
|
|
|
__PROMPT_PAULMILLR_COLORS=(
|
|
|
|
"%F{cyan}"
|
|
|
|
"%F{cyan}"
|
|
|
|
"%F{yellow}"
|
|
|
|
"%F{yellow}"
|
|
|
|
"%F{magenta}"
|
|
|
|
"%F{magenta}"
|
|
|
@ -88,10 +88,10 @@ function prompt_steeef_setup() {
|
|
|
|
# %a - action (e.g. rebase-i)
|
|
|
|
# %a - action (e.g. rebase-i)
|
|
|
|
# %R - repository path
|
|
|
|
# %R - repository path
|
|
|
|
# %S - path in the repository
|
|
|
|
# %S - path in the repository
|
|
|
|
local fmt_branch="(${__PROMPT_STEEEF_COLORS[1]}%b%f%u%c)"
|
|
|
|
local fmt_branch="(${__PROMPT_PAULMILLR_COLORS[1]}%b%f%u%c)"
|
|
|
|
local fmt_action="(${__PROMPT_STEEEF_COLORS[5]}%a%f)"
|
|
|
|
local fmt_action="(${__PROMPT_PAULMILLR_COLORS[5]}%a%f)"
|
|
|
|
local fmt_unstaged="${__PROMPT_STEEEF_COLORS[2]}!%f"
|
|
|
|
local fmt_unstaged="${__PROMPT_PAULMILLR_COLORS[2]}!%f"
|
|
|
|
local fmt_staged="${__PROMPT_STEEEF_COLORS[5]}+%f"
|
|
|
|
local fmt_staged="${__PROMPT_PAULMILLR_COLORS[5]}+%f"
|
|
|
|
|
|
|
|
|
|
|
|
zstyle ':vcs_info:*:prompt:*' unstagedstr "${fmt_unstaged}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' unstagedstr "${fmt_unstaged}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' stagedstr "${fmt_staged}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' stagedstr "${fmt_staged}"
|
|
|
@ -99,9 +99,9 @@ function prompt_steeef_setup() {
|
|
|
|
zstyle ':vcs_info:*:prompt:*' formats "${fmt_branch}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' formats "${fmt_branch}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' nvcsformats ""
|
|
|
|
zstyle ':vcs_info:*:prompt:*' nvcsformats ""
|
|
|
|
|
|
|
|
|
|
|
|
# ${__PROMPT_STEEEF_COLORS[3]}%n%f@${__PROMPT_STEEEF_COLORS[2]}%m%f in
|
|
|
|
# ${__PROMPT_PAULMILLR_COLORS[3]}%n%f@${__PROMPT_PAULMILLR_COLORS[2]}%m%f in
|
|
|
|
PROMPT="${__PROMPT_STEEEF_COLORS[4]}→ ${__PROMPT_STEEEF_COLORS[5]}%1~%f "'${vcs_info_msg_0_}'" $ "
|
|
|
|
PROMPT="${__PROMPT_PAULMILLR_COLORS[4]}→ ${__PROMPT_PAULMILLR_COLORS[5]}%1~%f "'${vcs_info_msg_0_}'" $ "
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
prompt_steeef_setup "$@"
|
|
|
|
prompt_paulmillr_setup "$@"
|
|
|
|
|
|
|
|
|
|
|
|