mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-19 20:29:45 +01:00
refactor(gallois): clean up theme and fix typos
This commit is contained in:
parent
f75f8bb930
commit
c52e646bb7
1 changed files with 8 additions and 7 deletions
|
@ -1,4 +1,5 @@
|
||||||
# Depends on the git plugin for work_in_progress()
|
# Depends on the git plugin for work_in_progress()
|
||||||
|
(( $+functions[work_in_progress] )) || work_in_progress() {}
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
|
||||||
|
@ -7,10 +8,11 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
|
# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
|
||||||
git_custom_status() {
|
git_custom_status() {
|
||||||
local cb=$(git_current_branch)
|
local branch=$(git_current_branch)
|
||||||
if [ -n "$cb" ]; then
|
[[ -n "$branch" ]] || return 0
|
||||||
echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
echo "$(parse_git_dirty)\
|
||||||
fi
|
%{${fg_bold[yellow]}%}$(work_in_progress)%{$reset_color%}\
|
||||||
|
${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# RVM component of prompt
|
# RVM component of prompt
|
||||||
|
@ -18,6 +20,5 @@ ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}["
|
||||||
ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
|
ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
|
||||||
|
|
||||||
# Combine it all into a final right-side prompt
|
# Combine it all into a final right-side prompt
|
||||||
RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
|
RPS1="\$(git_custom_status)\$(ruby_prompt_info)${RPS1:+ $RPS1}"
|
||||||
|
|
||||||
PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
|
PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
|
||||||
|
|
Loading…
Reference in a new issue