Merge 501d7f799f
into 7d952adf2b
This commit is contained in:
commit
8c288356ac
|
@ -141,6 +141,12 @@ prompt_eriner_main() {
|
||||||
prompt_eriner_precmd() {
|
prompt_eriner_precmd() {
|
||||||
vcs_info
|
vcs_info
|
||||||
PROMPT='%{%f%b%k%}$(prompt_eriner_main) '
|
PROMPT='%{%f%b%k%}$(prompt_eriner_main) '
|
||||||
|
RPROMPT="${ZIM_PROMPT_INSERTMODE:+${${KEYMAP/vicmd/[NORMAL]}/(main|viins)/}}"
|
||||||
|
}
|
||||||
|
|
||||||
|
zle-keymap-slect() {
|
||||||
|
prompt_eriner_precmd
|
||||||
|
zle reset-prompt
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_eriner_setup() {
|
prompt_eriner_setup() {
|
||||||
|
@ -149,7 +155,9 @@ prompt_eriner_setup() {
|
||||||
|
|
||||||
prompt_opts=(cr subst percent)
|
prompt_opts=(cr subst percent)
|
||||||
|
|
||||||
add-zsh-hook precmd prompt_eriner_precmd
|
add-zsh-hook prompt_eriner_precmd
|
||||||
|
|
||||||
|
[[ "$ZIM_PROMPT_INSERTMODE" != '' ]] && zle -N zle-keymap-select
|
||||||
|
|
||||||
zstyle ':vcs_info:*' enable git
|
zstyle ':vcs_info:*' enable git
|
||||||
zstyle ':vcs_info:*' check-for-changes false
|
zstyle ':vcs_info:*' check-for-changes false
|
||||||
|
|
|
@ -15,6 +15,13 @@ prompt_gitster_get_pwd() {
|
||||||
|
|
||||||
prompt_gitster_precmd() {
|
prompt_gitster_precmd() {
|
||||||
[[ ${+functions[git-info]} ]] && git-info
|
[[ ${+functions[git-info]} ]] && git-info
|
||||||
|
PROMPT='$(prompt_gitster_get_status)%F{white}$(prompt_gitster_get_pwd)${(e)git_info[prompt]}%f '
|
||||||
|
RPROMPT="${ZIM_PROMPT_INSERTMODE:+${${KEYMAP/vicmd/[NORMAL]}/(main|viins)/}}"
|
||||||
|
}
|
||||||
|
|
||||||
|
zle-keymap-select() {
|
||||||
|
prompt_gitster_precmd
|
||||||
|
zle reset-prompt
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_gitster_setup() {
|
prompt_gitster_setup() {
|
||||||
|
@ -25,15 +32,14 @@ prompt_gitster_setup() {
|
||||||
|
|
||||||
add-zsh-hook precmd prompt_gitster_precmd
|
add-zsh-hook precmd prompt_gitster_precmd
|
||||||
|
|
||||||
|
[[ "$ZIM_PROMPT_INSERTMODE" != '' ]] && zle -N zle-keymap-select
|
||||||
|
|
||||||
zstyle ':zim:git-info:branch' format '%b'
|
zstyle ':zim:git-info:branch' format '%b'
|
||||||
zstyle ':zim:git-info:commit' format '%c'
|
zstyle ':zim:git-info:commit' format '%c'
|
||||||
zstyle ':zim:git-info:clean' format '%F{green}✓'
|
zstyle ':zim:git-info:clean' format '%F{green}✓'
|
||||||
zstyle ':zim:git-info:dirty' format '%F{yellow}✗'
|
zstyle ':zim:git-info:dirty' format '%F{yellow}✗'
|
||||||
zstyle ':zim:git-info:keys' format \
|
zstyle ':zim:git-info:keys' format \
|
||||||
'prompt' ' %F{cyan}%b%c %C%D'
|
'prompt' ' %F{cyan}%b%c %C%D'
|
||||||
|
|
||||||
PROMPT='$(prompt_gitster_get_status)%F{white}$(prompt_gitster_get_pwd)${(e)git_info[prompt]}%f '
|
|
||||||
RPROMPT=''
|
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_gitster_setup "$@"
|
prompt_gitster_setup "$@"
|
||||||
|
|
|
@ -44,6 +44,13 @@ prompt_magicmace_precmd() {
|
||||||
if [[ ${+functions[git-info]} ]]; then
|
if [[ ${+functions[git-info]} ]]; then
|
||||||
git-info
|
git-info
|
||||||
fi
|
fi
|
||||||
|
PROMPT='${COLOR_USER_LEVEL}$(prompt_magicmace_status)[${COLOR_NORMAL}$(short_pwd)${COLOR_USER_LEVEL}]${(e)git_info[prompt]}── ─%f '
|
||||||
|
RPROMPT="${ZIM_PROMPT_INSERTMODE:+${${KEYMAP/vicmd/[NORMAL]}/(main|viins)/}}"
|
||||||
|
}
|
||||||
|
|
||||||
|
zle-keymap-select() {
|
||||||
|
prompt_magicmace_precmd
|
||||||
|
zle reset-prompt
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_magicmace_setup() {
|
prompt_magicmace_setup() {
|
||||||
|
@ -54,6 +61,8 @@ prompt_magicmace_setup() {
|
||||||
|
|
||||||
add-zsh-hook precmd prompt_magicmace_precmd
|
add-zsh-hook precmd prompt_magicmace_precmd
|
||||||
|
|
||||||
|
[[ "$ZIM_PROMPT_INSERTMODE" != '' ]] && zle -N zle-keymap-select
|
||||||
|
|
||||||
zstyle ':zim:git-info:branch' format '%b'
|
zstyle ':zim:git-info:branch' format '%b'
|
||||||
zstyle ':zim:git-info:commit' format '%c...'
|
zstyle ':zim:git-info:commit' format '%c...'
|
||||||
zstyle ':zim:git-info:dirty' format '*'
|
zstyle ':zim:git-info:dirty' format '*'
|
||||||
|
@ -63,8 +72,6 @@ prompt_magicmace_setup() {
|
||||||
'prompt' '─[${COLOR_NORMAL}%b%c%D%A%B${COLOR_USER_LEVEL}]'
|
'prompt' '─[${COLOR_NORMAL}%b%c%D%A%B${COLOR_USER_LEVEL}]'
|
||||||
|
|
||||||
# Call git directly, ignoring aliases under the same name.
|
# Call git directly, ignoring aliases under the same name.
|
||||||
PROMPT='${COLOR_USER_LEVEL}$(prompt_magicmace_status)[${COLOR_NORMAL}$(short_pwd)${COLOR_USER_LEVEL}]${(e)git_info[prompt]}── ─%f '
|
|
||||||
RPROMPT=''
|
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_magicmace_setup "$@"
|
prompt_magicmace_setup "$@"
|
||||||
|
|
|
@ -40,11 +40,17 @@ prompt_steeef_precmd() {
|
||||||
vcs_info 'prompt'
|
vcs_info 'prompt'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
RPROMPT="${ZIM_PROMPT_INSERTMODE:+${${KEYMAP/vicmd/[NORMAL]}/(main|viins)/}}"
|
||||||
PROMPT='
|
PROMPT='
|
||||||
%{$purple%}%n${${reset_color}%} at %{$orange%}%m${${reset_color}%} in %{$limegreen%}%~${${reset_color}%} $vcs_info_msg_0_$(virtualenv_info)%{${reset_color}%}
|
%{$purple%}%n${${reset_color}%} at %{$orange%}%m${${reset_color}%} in %{$limegreen%}%~${${reset_color}%} $vcs_info_msg_0_$(virtualenv_info)%{${reset_color}%}
|
||||||
%(!.#.$) '
|
%(!.#.$) '
|
||||||
}
|
}
|
||||||
|
|
||||||
|
zle-keymap-select() {
|
||||||
|
prompt_steeef_precmd
|
||||||
|
zle reset-prompt
|
||||||
|
}
|
||||||
|
|
||||||
prompt_steeef_setup() {
|
prompt_steeef_setup() {
|
||||||
#use extended color pallete if available
|
#use extended color pallete if available
|
||||||
if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
|
if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
|
||||||
|
@ -96,6 +102,7 @@ prompt_steeef_setup() {
|
||||||
add-zsh-hook preexec steeef_preexec
|
add-zsh-hook preexec steeef_preexec
|
||||||
add-zsh-hook chpwd steeef_chpwd
|
add-zsh-hook chpwd steeef_chpwd
|
||||||
add-zsh-hook precmd prompt_steeef_precmd
|
add-zsh-hook precmd prompt_steeef_precmd
|
||||||
|
[[ "$ZIM_PROMPT_INSERTMODE" != '' ]] && zle -N zle-keymap-select
|
||||||
prompt_opts=(cr subst percent)
|
prompt_opts=(cr subst percent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue