mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-21 11:51:57 +00:00
6bebc254e8
Fix issue related to #7615, #7747 and #6346 After the update, aws prompt (which should be visible out of the box) disappears when a user uses a theme af-magic, because of fact that plugins are loaded before themes. This pull request fixes issue with not showing aws prompt in theme af-magic, by appending RPROMPT in theme af-magic instead overwriting.
39 lines
1.2 KiB
Bash
39 lines
1.2 KiB
Bash
# af-magic.zsh-theme
|
|
# Repo: https://github.com/andyfleming/oh-my-zsh
|
|
# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
|
|
|
|
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
|
|
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
|
|
|
# primary prompt
|
|
PROMPT='$FG[237]${(l.COLUMNS..-.)}%{$reset_color%}
|
|
$FG[032]%~\
|
|
$(git_prompt_info)$(hg_prompt_info) \
|
|
$FG[105]%(!.#.»)%{$reset_color%} '
|
|
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
|
|
RPS1='${return_code}'
|
|
|
|
|
|
# color vars
|
|
eval my_gray='$FG[237]'
|
|
eval my_orange='$FG[214]'
|
|
|
|
# right prompt
|
|
if type "virtualenv_prompt_info" > /dev/null
|
|
then
|
|
RPROMPT="${RPROMPT}"'$FG[078]$(virtualenv_prompt_info)%{$reset_color%} $my_gray%n@%m%{$reset_color%}%'
|
|
else
|
|
RPROMPT="${RPROMPT}"'$my_gray%n@%m%{$reset_color%}%'
|
|
fi
|
|
|
|
# git settings
|
|
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%}"
|