themes/powerline: Add user-info text color

This commit is contained in:
GiulianoWF
2023-12-31 01:50:42 +00:00
parent c4ebb2cb27
commit dea611bd13
9 changed files with 16 additions and 5 deletions

View File

@@ -7,6 +7,7 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
USER_INFO_THEME_PROMPT_COLOR=45 USER_INFO_THEME_PROMPT_COLOR=45
USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-"
USER_INFO_THEME_PROMPT_COLOR_SUDO=1 USER_INFO_THEME_PROMPT_COLOR_SUDO=1
PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "} PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "}

View File

@@ -13,6 +13,7 @@ function __powerline_right_segment {
local separator_char="${POWERLINE_RIGHT_SEPARATOR}" local separator_char="${POWERLINE_RIGHT_SEPARATOR}"
local padding=2 local padding=2
local separator_color="" local separator_color=""
local text_color=${params[2]:-"-"}
if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
separator_color="$(set_color ${params[1]} -)" separator_color="$(set_color ${params[1]} -)"
@@ -20,7 +21,7 @@ function __powerline_right_segment {
separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})" separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})"
(( padding += 1 )) (( padding += 1 ))
fi 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 )) RIGHT_PROMPT_LENGTH=$(( ${#params[0]} + RIGHT_PROMPT_LENGTH + padding ))
LAST_SEGMENT_COLOR="${params[1]}" LAST_SEGMENT_COLOR="${params[1]}"
(( SEGMENTS_AT_RIGHT += 1 )) (( SEGMENTS_AT_RIGHT += 1 ))

View File

@@ -8,6 +8,7 @@ POWERLINE_RIGHT_SEPARATOR=${POWERLINE_RIGHT_SEPARATOR:=""}
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
USER_INFO_THEME_PROMPT_COLOR=32 USER_INFO_THEME_PROMPT_COLOR=32
USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-"
USER_INFO_THEME_PROMPT_COLOR_SUDO=202 USER_INFO_THEME_PROMPT_COLOR_SUDO=202
PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "} PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "}

View File

@@ -8,10 +8,11 @@ function __powerline_left_segment {
IFS="${OLD_IFS}" IFS="${OLD_IFS}"
local separator_char="" local separator_char=""
local separator="" local separator=""
local background_color=${params[2]:-"-"}
if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
separator="${separator_char}" separator="${separator_char}"
fi 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 )) (( SEGMENTS_AT_LEFT += 1 ))
} }

View File

@@ -7,6 +7,7 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
USER_INFO_THEME_PROMPT_COLOR=240 USER_INFO_THEME_PROMPT_COLOR=240
USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-"
USER_INFO_THEME_PROMPT_COLOR_SUDO=202 USER_INFO_THEME_PROMPT_COLOR_SUDO=202
PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "} PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "}

View File

@@ -6,8 +6,9 @@ function __powerline_left_segment {
local OLD_IFS="${IFS}"; IFS="|" local OLD_IFS="${IFS}"; IFS="|"
local params=( $1 ) local params=( $1 )
IFS="${OLD_IFS}" 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]} LAST_SEGMENT_COLOR=${params[1]}
} }

View File

@@ -4,6 +4,7 @@ source "$OSH/themes/powerline-plain/powerline-plain.base.sh"
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "}
USER_INFO_THEME_PROMPT_COLOR=32 USER_INFO_THEME_PROMPT_COLOR=32
USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-"
USER_INFO_THEME_PROMPT_COLOR_SUDO=202 USER_INFO_THEME_PROMPT_COLOR_SUDO=202
PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "} PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "}

View File

@@ -47,6 +47,7 @@ function set_color {
function __powerline_user_info_prompt { function __powerline_user_info_prompt {
local user_info="" local user_info=""
local color=${USER_INFO_THEME_PROMPT_COLOR} local color=${USER_INFO_THEME_PROMPT_COLOR}
local secondary_color="${USER_INFO_THEME_PROMPT_SECONDARY_COLOR}"
if [[ "${THEME_CHECK_SUDO}" = true ]]; then if [[ "${THEME_CHECK_SUDO}" = true ]]; then
# check whether sudo is active for no-password executions # check whether sudo is active for no-password executions
@@ -68,7 +69,7 @@ function __powerline_user_info_prompt {
fi fi
;; ;;
esac esac
[[ -n "${user_info}" ]] && echo "${user_info}|${color}" [[ -n "${user_info}" ]] && echo "${user_info}|${color}|${secondary_color}"
} }
function __powerline_ruby_prompt { function __powerline_ruby_prompt {
@@ -158,11 +159,13 @@ function __powerline_left_segment {
IFS="${OLD_IFS}" IFS="${OLD_IFS}"
local separator_char="${POWERLINE_LEFT_SEPARATOR}" local separator_char="${POWERLINE_LEFT_SEPARATOR}"
local separator="" local separator=""
local text_color=${params[2]:-"-"}
if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${_omb_prompt_normal}" separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${_omb_prompt_normal}"
fi 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]} LAST_SEGMENT_COLOR=${params[1]}
(( SEGMENTS_AT_LEFT += 1 )) (( SEGMENTS_AT_LEFT += 1 ))
} }

View File

@@ -7,6 +7,7 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
USER_INFO_THEME_PROMPT_COLOR=32 USER_INFO_THEME_PROMPT_COLOR=32
USER_INFO_THEME_PROMPT_SECONDARY_COLOR="-"
USER_INFO_THEME_PROMPT_COLOR_SUDO=202 USER_INFO_THEME_PROMPT_COLOR_SUDO=202
PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "} PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="p "}