From dea611bd13b8884d00e38e8d8a668d440f476589 Mon Sep 17 00:00:00 2001 From: GiulianoWF Date: Sun, 31 Dec 2023 01:50:42 +0000 Subject: [PATCH] themes/powerline: Add user-info text color --- themes/powerline-light/powerline-light.theme.sh | 1 + themes/powerline-multiline/powerline-multiline.base.sh | 3 ++- themes/powerline-multiline/powerline-multiline.theme.sh | 1 + themes/powerline-naked/powerline-naked.base.sh | 3 ++- themes/powerline-naked/powerline-naked.theme.sh | 1 + themes/powerline-plain/powerline-plain.base.sh | 3 ++- themes/powerline-plain/powerline-plain.theme.sh | 1 + themes/powerline/powerline.base.sh | 7 +++++-- themes/powerline/powerline.theme.sh | 1 + 9 files changed, 16 insertions(+), 5 deletions(-) diff --git a/themes/powerline-light/powerline-light.theme.sh b/themes/powerline-light/powerline-light.theme.sh index c4df99c..3e7a547 100644 --- a/themes/powerline-light/powerline-light.theme.sh +++ b/themes/powerline-light/powerline-light.theme.sh @@ -7,6 +7,7 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_THEME_PROMPT_COLOR=45 +USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-" USER_INFO_THEME_PROMPT_COLOR_SUDO=1 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "} diff --git a/themes/powerline-multiline/powerline-multiline.base.sh b/themes/powerline-multiline/powerline-multiline.base.sh index b25b0c4..a020ebc 100644 --- a/themes/powerline-multiline/powerline-multiline.base.sh +++ b/themes/powerline-multiline/powerline-multiline.base.sh @@ -13,6 +13,7 @@ function __powerline_right_segment { local separator_char="${POWERLINE_RIGHT_SEPARATOR}" local padding=2 local separator_color="" + local text_color=${params[2]:-"-"} if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then separator_color="$(set_color ${params[1]} -)" @@ -20,7 +21,7 @@ function __powerline_right_segment { separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})" (( padding += 1 )) fi - RIGHT_PROMPT+="${separator_color}${separator_char}${_omb_prompt_normal}$(set_color - ${params[1]}) ${params[0]} ${_omb_prompt_normal}$(set_color - ${COLOR})${_omb_prompt_normal}" + RIGHT_PROMPT+="${separator_color}${separator_char}${_omb_prompt_normal}$(set_color ${text_color} ${params[1]}) ${params[0]} ${_omb_prompt_normal}$(set_color - ${COLOR})${_omb_prompt_normal}" RIGHT_PROMPT_LENGTH=$(( ${#params[0]} + RIGHT_PROMPT_LENGTH + padding )) LAST_SEGMENT_COLOR="${params[1]}" (( SEGMENTS_AT_RIGHT += 1 )) diff --git a/themes/powerline-multiline/powerline-multiline.theme.sh b/themes/powerline-multiline/powerline-multiline.theme.sh index 0a1bbdd..6fef996 100644 --- a/themes/powerline-multiline/powerline-multiline.theme.sh +++ b/themes/powerline-multiline/powerline-multiline.theme.sh @@ -8,6 +8,7 @@ POWERLINE_RIGHT_SEPARATOR=${POWERLINE_RIGHT_SEPARATOR:=""} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_THEME_PROMPT_COLOR=32 +USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-" USER_INFO_THEME_PROMPT_COLOR_SUDO=202 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "} diff --git a/themes/powerline-naked/powerline-naked.base.sh b/themes/powerline-naked/powerline-naked.base.sh index 0cd4239..accb094 100644 --- a/themes/powerline-naked/powerline-naked.base.sh +++ b/themes/powerline-naked/powerline-naked.base.sh @@ -8,10 +8,11 @@ function __powerline_left_segment { IFS="${OLD_IFS}" local separator_char="" local separator="" + local background_color=${params[2]:-"-"} if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then separator="${separator_char}" fi - LEFT_PROMPT+="${separator}$(set_color ${params[1]} -) ${params[0]} ${_omb_prompt_normal}" + LEFT_PROMPT+="${separator}$(set_color ${params[1]} ${background_color}) ${params[0]} ${_omb_prompt_normal}" (( SEGMENTS_AT_LEFT += 1 )) } diff --git a/themes/powerline-naked/powerline-naked.theme.sh b/themes/powerline-naked/powerline-naked.theme.sh index cd3a367..7a8395b 100644 --- a/themes/powerline-naked/powerline-naked.theme.sh +++ b/themes/powerline-naked/powerline-naked.theme.sh @@ -7,6 +7,7 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_THEME_PROMPT_COLOR=240 +USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-" USER_INFO_THEME_PROMPT_COLOR_SUDO=202 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "} diff --git a/themes/powerline-plain/powerline-plain.base.sh b/themes/powerline-plain/powerline-plain.base.sh index f8a1cc8..f35ee88 100644 --- a/themes/powerline-plain/powerline-plain.base.sh +++ b/themes/powerline-plain/powerline-plain.base.sh @@ -6,8 +6,9 @@ function __powerline_left_segment { local OLD_IFS="${IFS}"; IFS="|" local params=( $1 ) IFS="${OLD_IFS}" + local text_color=${params[2]:-"-"} - LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${_omb_prompt_normal}" + LEFT_PROMPT+="${separator}$(set_color ${text_color} ${params[1]}) ${params[0]} ${_omb_prompt_normal}" LAST_SEGMENT_COLOR=${params[1]} } diff --git a/themes/powerline-plain/powerline-plain.theme.sh b/themes/powerline-plain/powerline-plain.theme.sh index f8ee6ae..2947cde 100644 --- a/themes/powerline-plain/powerline-plain.theme.sh +++ b/themes/powerline-plain/powerline-plain.theme.sh @@ -4,6 +4,7 @@ source "$OSH/themes/powerline-plain/powerline-plain.base.sh" USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "} USER_INFO_THEME_PROMPT_COLOR=32 +USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-" USER_INFO_THEME_PROMPT_COLOR_SUDO=202 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "} diff --git a/themes/powerline/powerline.base.sh b/themes/powerline/powerline.base.sh index 7b63992..da75507 100644 --- a/themes/powerline/powerline.base.sh +++ b/themes/powerline/powerline.base.sh @@ -47,6 +47,7 @@ function set_color { function __powerline_user_info_prompt { local user_info="" local color=${USER_INFO_THEME_PROMPT_COLOR} + local secondary_color="${USER_INFO_THEME_PROMPT_SECONDARY_COLOR}" if [[ "${THEME_CHECK_SUDO}" = true ]]; then # check whether sudo is active for no-password executions @@ -68,7 +69,7 @@ function __powerline_user_info_prompt { fi ;; esac - [[ -n "${user_info}" ]] && echo "${user_info}|${color}" + [[ -n "${user_info}" ]] && echo "${user_info}|${color}|${secondary_color}" } function __powerline_ruby_prompt { @@ -158,11 +159,13 @@ function __powerline_left_segment { IFS="${OLD_IFS}" local separator_char="${POWERLINE_LEFT_SEPARATOR}" local separator="" + local text_color=${params[2]:-"-"} if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${_omb_prompt_normal}" fi - LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${_omb_prompt_normal}" + + LEFT_PROMPT+="${separator}$(set_color ${text_color} ${params[1]}) ${params[0]} ${_omb_prompt_normal}" LAST_SEGMENT_COLOR=${params[1]} (( SEGMENTS_AT_LEFT += 1 )) } diff --git a/themes/powerline/powerline.theme.sh b/themes/powerline/powerline.theme.sh index 04836f2..92e54b2 100644 --- a/themes/powerline/powerline.theme.sh +++ b/themes/powerline/powerline.theme.sh @@ -7,6 +7,7 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_THEME_PROMPT_COLOR=32 +USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-" USER_INFO_THEME_PROMPT_COLOR_SUDO=202 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}