summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Armand <marmand68@gmail.com>2019-08-19 12:54:49 -0400
committerMarc Cornellà <marc.cornella@live.com>2019-08-19 18:54:49 +0200
commit43ed0b455ed5bbf66ef3e604c3d9845eb90f0078 (patch)
tree223c1087fb5fe9ddb275a20228723eee7ca0d587
parente604eaf55e1c5b19035778c0e0adb0dd6e344b94 (diff)
downloadzsh-43ed0b455ed5bbf66ef3e604c3d9845eb90f0078.tar.gz
zsh-43ed0b455ed5bbf66ef3e604c3d9845eb90f0078.tar.bz2
zsh-43ed0b455ed5bbf66ef3e604c3d9845eb90f0078.zip
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
-rw-r--r--themes/af-magic.zsh-theme10
1 files changed, 8 insertions, 2 deletions
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 2a6595a71..d185fa1ab 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -8,7 +8,7 @@ local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
# primary prompt
PROMPT='$FG[237]${(l.COLUMNS..-.)}%{$reset_color%}
$FG[032]%~\
-$(git_prompt_info) \
+$(git_prompt_info)$(hg_prompt_info) \
$FG[105]%(!.#.»)%{$reset_color%} '
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
RPS1='${return_code}'
@@ -21,7 +21,7 @@ eval my_orange='$FG[214]'
# right prompt
if type "virtualenv_prompt_info" > /dev/null
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
RPROMPT='$my_gray%n@%m%{$reset_color%}%'
fi
@@ -31,3 +31,9 @@ ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075]($FG[078]"
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$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%}"