mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 21:41:07 +01:00
Merge pull request #839 from eproxus/sunrise-fixes
Correct color and font issues on Ubuntu
This commit is contained in:
commit
1c468c63c0
1 changed files with 11 additions and 11 deletions
|
@ -5,16 +5,15 @@
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
# Color shortcuts
|
# Color shortcuts
|
||||||
R=$fg[red]
|
R=$fg_no_bold[red]
|
||||||
G=$fg[green]
|
G=$fg_no_bold[green]
|
||||||
M=$fg[magenta]
|
M=$fg_no_bold[magenta]
|
||||||
RB=$fg_bold[red]
|
Y=$fg_no_bold[yellow]
|
||||||
YB=$fg_bold[yellow]
|
B=$fg_no_bold[blue]
|
||||||
BB=$fg_bold[blue]
|
|
||||||
RESET=$reset_color
|
RESET=$reset_color
|
||||||
|
|
||||||
if [ "$(whoami)" = "root" ]; then
|
if [ "$(whoami)" = "root" ]; then
|
||||||
PROMPTCOLOR="%{$RB%}" PREFIX="-!-";
|
PROMPTCOLOR="%{$R%}" PREFIX="-!-";
|
||||||
else
|
else
|
||||||
PROMPTCOLOR="" PREFIX="---";
|
PROMPTCOLOR="" PREFIX="---";
|
||||||
fi
|
fi
|
||||||
|
@ -73,13 +72,14 @@ function custom_git_prompt() {
|
||||||
PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
|
PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
|
||||||
RPS1="${return_code}"
|
RPS1="${return_code}"
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$Y%}‹"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$YB%}›%{$RESET%} "
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$Y%}›%{$RESET%} "
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*"
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➔"
|
ZSH_THEME_GIT_PROMPT_AHEAD="%{$B%}➔"
|
||||||
|
|
||||||
|
|
||||||
ZSH_THEME_GIT_STATUS_PREFIX=" "
|
ZSH_THEME_GIT_STATUS_PREFIX=" "
|
||||||
|
|
||||||
|
@ -90,7 +90,7 @@ ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
|
||||||
ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
|
ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
|
||||||
|
|
||||||
# Not-staged
|
# Not-staged
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}⁇"
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}?"
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
|
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
|
ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"
|
||||||
|
|
Loading…
Reference in a new issue