af-magic: add hg prompt and tweak virtualenv info (#8056)

- Add mercurial support to af-magic, so now the vcs prompt will show up in either a git or hg repository
- The virtualenv prompt was white and bumped up against the user@hostname output
- Fixed that so its green (which I thought highlighted it more thematically) and has a space before user@hostname
This commit is contained in:
Matthew Armand 2019-08-19 12:54:49 -04:00 committed by Marc Cornellà
parent e604eaf55e
commit 43ed0b455e

View file

@ -8,7 +8,7 @@ local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
# primary prompt # primary prompt
PROMPT='$FG[237]${(l.COLUMNS..-.)}%{$reset_color%} PROMPT='$FG[237]${(l.COLUMNS..-.)}%{$reset_color%}
$FG[032]%~\ $FG[032]%~\
$(git_prompt_info) \ $(git_prompt_info)$(hg_prompt_info) \
$FG[105]%(!.#.»)%{$reset_color%} ' $FG[105]%(!.#.»)%{$reset_color%} '
PROMPT2='%{$fg[red]%}\ %{$reset_color%}' PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
RPS1='${return_code}' RPS1='${return_code}'
@ -21,7 +21,7 @@ eval my_orange='$FG[214]'
# right prompt # right prompt
if type "virtualenv_prompt_info" > /dev/null if type "virtualenv_prompt_info" > /dev/null
then then
RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' RPROMPT='$FG[078]$(virtualenv_prompt_info)%{$reset_color%} $my_gray%n@%m%{$reset_color%}%'
else else
RPROMPT='$my_gray%n@%m%{$reset_color%}%' RPROMPT='$my_gray%n@%m%{$reset_color%}%'
fi fi
@ -31,3 +31,9 @@ ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075]($FG[078]"
ZSH_THEME_GIT_PROMPT_CLEAN="" ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
# hg settings
ZSH_THEME_HG_PROMPT_PREFIX="$FG[075]($FG[078]"
ZSH_THEME_HG_PROMPT_CLEAN=""
ZSH_THEME_HG_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
ZSH_THEME_HG_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"