linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-22 04:51:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use %F instead of $fg

Browse source 
In addition to more succinct, %F{color} is also MUCH more readable
than %{$fg[color]%}
This commit is contained in:
Pandu POLUAN 2017-10-13 00:16:45 +07:00
commit 274462c558
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
themes/ys-pep.zsh-theme
View file

@ -21,11 +21,11 @@
# Sep-Oct 2017 Pandu POLUAN <pepoluan@gmail.com> # Sep-Oct 2017 Pandu POLUAN <pepoluan@gmail.com>
# VCS # VCS
YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} " YS_VCS_PROMPT_PREFIX1=" %F{white}on%{$reset_color%} "
YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}" YS_VCS_PROMPT_PREFIX2=":%F{cyan}"
YS_VCS_PROMPT_SUFFIX="%{$reset_color%}" YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x" YS_VCS_PROMPT_DIRTY=" %F{red}x"
YS_VCS_PROMPT_CLEAN=" %{$fg[green]%}o" YS_VCS_PROMPT_CLEAN=" %F{green}o"
# Git info # Git info
local git_info='$(git_prompt_info)' local git_info='$(git_prompt_info)'
@ -50,30 +50,30 @@ ys_hg_prompt_info() {
fi fi
} }
local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%} )" local exit_code="%(?,,C:%F{red}%?%{$reset_color%} )"
### BEGIN: pepoluan changes ### ### BEGIN: pepoluan changes ###
local dgrey="$terminfo[bold]$fg[black]" local dgrey="%B%F{black}"
# Show my IP Address # Show my IP Address
ZSH_THEME_SHOW_IP=1 ZSH_THEME_SHOW_IP=1
yspep_my_ip() { yspep_my_ip() {
[[ $ZSH_THEME_SHOW_IP != 1 ]] && return [[ $ZSH_THEME_SHOW_IP != 1 ]] && return
echo -n "%{$dgrey%}[%{$fg[green]%}" echo -n "${dgrey}[%F{green}"
local i local i
if [[ ${(L)_system_name} == cygwin ]]; then if [[ ${(L)_system_name} == cygwin ]]; then
echo -n $(ipconfig | awk '$1 ~ /IP/ && $2 ~ /[Aa]ddress/ {sub(/.*:/, "", $0); gsub(/[ \t\r]/, "", $0); print $0}') echo -n $(ipconfig | awk '$1 ~ /IP/ && $2 ~ /[Aa]ddress/ {sub(/.*:/, "", $0); gsub(/[ \t\r]/, "", $0); print $0}')
else else
echo -n $(ip -o addr show | awk -v atype=${1:-inet} '$2 != "lo" && $3 == atype {gsub(/\/[0-9]+/, "", $4); print $4}') echo -n $(ip -o addr show | awk -v atype=${1:-inet} '$2 != "lo" && $3 == atype {gsub(/\/[0-9]+/, "", $4); print $4}')
fi fi
echo "%{$dgrey%}]" echo "${dgrey}]"
} }
local ip_info='$(yspep_my_ip)' local ip_info='$(yspep_my_ip)'
# Show Virtualenv # Show Virtualenv
ZSH_THEME_VIRTUALENV_PREFIX=" V:" ZSH_THEME_VIRTUALENV_PREFIX=" V:"
ZSH_THEME_VIRTUALENV_SUFFIX=" " ZSH_THEME_VIRTUALENV_SUFFIX=" "
local venv_info="%{$terminfo[bold]$fg[blue]\$(virtualenv_prompt_info)$reset_color%}" local venv_info="%B%F{blue}\$(virtualenv_prompt_info)%{$reset_color%}"
# Other info, you can override this function in .zshrc # Other info, you can override this function in .zshrc
yspep_other_info() { yspep_other_info() {
@ -92,14 +92,14 @@ local other_info='$(yspep_other_info)'
# % ys @ ys-mbp in ~/.oh-my-zsh on git:master x [21:47:42] C:0 # % ys @ ys-mbp in ~/.oh-my-zsh on git:master x [21:47:42] C:0
# $ # $
PROMPT=" PROMPT="
%{$dgrey%}[%*]%{$reset_color%} \ ${dgrey}[%*]%{$reset_color%} \
%(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n)\ %(#,%K{yellow}%F{black}%n%{$reset_color%},%F{cyan}%n)\
%{$fg[white]%}@%{$fg[green]%}%m$ip_info%{$dgrey%}:%{$reset_color%}\ %F{white}@%F{green}%m$ip_info$dgrey:%{$reset_color%}\
%{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\ %B%F{yellow}%~%{$reset_color%}\
${hg_info}\ ${hg_info}\
${git_info}\ ${git_info}\
$exit_code$venv_info$other_info $exit_code$venv_info$other_info
%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}" %B%F{red}%# %{$reset_color%}"
unset RPROMPT unset RPROMPT