theme/powerline-plain: remove copy of `powerline.base`
It seems like the copied functions were just slightly out of date without any altered functionality. The one actual difference was `$POWERLINE_PROMPT_AFTER` which is blank by default and is not documented anywhere and is not used anywhere and...I will guess it's not used. This theme seems to be about not using the powerline font, as opposed to being "simpler" in some way.pull/2053/head
parent
b16d7efcf5
commit
eacca87898
|
|
@ -4,11 +4,6 @@ Powerline Plain Theme
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
A colorful theme, where shows a lot information about your shell session.
|
A colorful theme, where shows a lot information about your shell session.
|
||||||
The plain powerline theme provides a simpler shell with less information.
|
The plain powerline theme does not require the installation of the powerline font.
|
||||||
|
|
||||||
See :ref:`powerline_base` for general information about the powerline theme.
|
See :ref:`powerline_base` for general information about the powerline theme.
|
||||||
|
|
||||||
Soft Separators
|
|
||||||
^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
|
|
||||||
|
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
. "$BASH_IT/themes/powerline/powerline.base.bash"
|
|
||||||
|
|
||||||
function __powerline_left_segment {
|
|
||||||
local OLD_IFS="${IFS}"; IFS="|"
|
|
||||||
local params=( $1 )
|
|
||||||
IFS="${OLD_IFS}"
|
|
||||||
local pad_before_segment=" "
|
|
||||||
|
|
||||||
if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
|
|
||||||
if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
|
|
||||||
pad_before_segment=""
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
|
|
||||||
pad_before_segment=""
|
|
||||||
fi
|
|
||||||
# Since the previous segment wasn't the last segment, add padding, if needed
|
|
||||||
#
|
|
||||||
if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
|
|
||||||
LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
LEFT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
|
|
||||||
LAST_SEGMENT_COLOR=${params[1]}
|
|
||||||
(( SEGMENTS_AT_LEFT += 1 ))
|
|
||||||
}
|
|
||||||
|
|
||||||
function __powerline_prompt_command {
|
|
||||||
local last_status="$?" ## always the first
|
|
||||||
|
|
||||||
LEFT_PROMPT=""
|
|
||||||
SEGMENTS_AT_LEFT=0
|
|
||||||
LAST_SEGMENT_COLOR=""
|
|
||||||
PROMPT_AFTER="${POWERLINE_PROMPT_AFTER}"
|
|
||||||
|
|
||||||
_save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
|
|
||||||
|
|
||||||
## left prompt ##
|
|
||||||
for segment in $POWERLINE_PROMPT; do
|
|
||||||
local info="$(__powerline_${segment}_prompt)"
|
|
||||||
[[ -n "${info}" ]] && __powerline_left_segment "${info}"
|
|
||||||
done
|
|
||||||
|
|
||||||
[[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
|
|
||||||
|
|
||||||
if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
|
|
||||||
__powerline_left_last_segment_padding
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
|
|
||||||
LEFT_PROMPT+=" "
|
|
||||||
fi
|
|
||||||
|
|
||||||
PS1="${LEFT_PROMPT}${PROMPT_AFTER}"
|
|
||||||
|
|
||||||
## cleanup ##
|
|
||||||
unset LAST_SEGMENT_COLOR \
|
|
||||||
LEFT_PROMPT \
|
|
||||||
SEGMENTS_AT_LEFT
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
# shellcheck disable=SC2034 # Expected behavior for themes.
|
||||||
. "$BASH_IT/themes/powerline-plain/powerline-plain.base.bash"
|
# shellcheck source-path=SCRIPTDIR/../powerline
|
||||||
|
source "${BASH_IT?}/themes/powerline/powerline.base.bash"
|
||||||
|
|
||||||
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "}
|
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "}
|
||||||
USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
|
USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
|
||||||
|
|
@ -12,7 +13,6 @@ POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLI
|
||||||
POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
|
POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
|
||||||
POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
|
POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
|
||||||
POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
|
POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
|
||||||
POWERLINE_PROMPT_AFTER=${POWERLINE_PROMPT_AFTER:-""}
|
|
||||||
|
|
||||||
PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "}
|
PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "}
|
||||||
CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="ⓔ "}
|
CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="ⓔ "}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue