mirror of
https://github.com/lloeki/dotfiles.git
synced 2025-12-06 07:24:39 +01:00
call git_ps1_vars once only and enable vas status
This commit is contained in:
parent
8dc73a7995
commit
47e4887d9d
2 changed files with 3 additions and 8 deletions
10
zsh/prompt
10
zsh/prompt
|
|
@ -127,7 +127,6 @@ prompt_dir() {
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_git() {
|
prompt_git() {
|
||||||
__git_ps1_vars
|
|
||||||
if [[ -n $GIT_PS1_STATUS ]]; then
|
if [[ -n $GIT_PS1_STATUS ]]; then
|
||||||
PROMPT_VCS_TYPE='git'
|
PROMPT_VCS_TYPE='git'
|
||||||
PROMPT_VCS_REF="$GIT_PS1_BRANCH"
|
PROMPT_VCS_REF="$GIT_PS1_BRANCH"
|
||||||
|
|
@ -264,7 +263,6 @@ prompt_vi_mode() {
|
||||||
|
|
||||||
function zle-line-init zle-keymap-select {
|
function zle-line-init zle-keymap-select {
|
||||||
set_prompt
|
set_prompt
|
||||||
set_rprompt
|
|
||||||
zle reset-prompt
|
zle reset-prompt
|
||||||
}
|
}
|
||||||
zle -N zle-line-init
|
zle -N zle-line-init
|
||||||
|
|
@ -285,18 +283,16 @@ rprompt_build() {
|
||||||
prompt_setup_segments
|
prompt_setup_segments
|
||||||
CURRENT_BG='NONE'
|
CURRENT_BG='NONE'
|
||||||
prompt_last_rc
|
prompt_last_rc
|
||||||
#prompt_vcs_status
|
prompt_vcs_status
|
||||||
#prompt_vcs_action
|
prompt_vcs_action
|
||||||
rprompt_end
|
rprompt_end
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_opts=(cr percent)
|
prompt_opts=(cr percent)
|
||||||
|
|
||||||
set_prompt() {
|
set_prompt() {
|
||||||
|
__git_ps1_vars
|
||||||
PROMPT="$(prompt_build)"
|
PROMPT="$(prompt_build)"
|
||||||
}
|
|
||||||
|
|
||||||
set_rprompt() {
|
|
||||||
RPROMPT="$(rprompt_build)"
|
RPROMPT="$(rprompt_build)"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
1
zsh/rc
1
zsh/rc
|
|
@ -22,7 +22,6 @@ precmd() {
|
||||||
LAST_CMD_RC=$?
|
LAST_CMD_RC=$?
|
||||||
psvar=()
|
psvar=()
|
||||||
set_prompt
|
set_prompt
|
||||||
set_rprompt
|
|
||||||
set_term_title
|
set_term_title
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue