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

Color simplification & bold-bleed fix

Browse source 
Simplify coloring by using exclusively %b + %f (and %k) to perform
color reset.

Also removed an unused local variable.
This commit is contained in:
Pandu POLUAN 2017-10-20 22:29:33 +07:00
commit 4ea3cebf5b
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,21 +59,20 @@ local dgrey="%B%F{black}"
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}[%F{green}" echo -n "${dgrey}[%b%F{green}"
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}]%b"
} }
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="%B%F{blue}\$(virtualenv_prompt_info)%{$reset_color%}" local venv_info="%B%F{blue}\$(virtualenv_prompt_info)%b"
# 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 +91,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}[%*]%b \
%(#,%K{yellow}%F{black}%n%{$reset_color%},%F{cyan}%n)\ %(#,%K{yellow}%F{black}%n%k,%F{cyan}%n)\
%F{white}@%F{green}%m$ip_info$dgrey:%{$reset_color%}\ %F{white}@%F{green}%m$ip_info$dgrey:%b\
%B%F{yellow}%~%{$reset_color%}\ %B%F{yellow}%~%b\
${hg_info}\ ${hg_info}\
${git_info}\ ${git_info}\
$exit_code$venv_info$other_info $exit_code$venv_info$other_info
%{%B%F{red}%}%#%{%b%f$reset_color%} " %B%F{red}%#%b%f "
unset RPROMPT unset RPROMPT