Added new wd function to powerline-flies theme. Changed the __powerline_prompt_command function to reflect the base function.

pull/1106/head
Dan Flies 2017-12-08 09:22:35 -06:00
parent fae18112cb
commit 35c29349bd
2 changed files with 14 additions and 8 deletions

View File

@ -1,6 +1,6 @@
. "$BASH_IT/themes/powerline/powerline.base.bash" . "$BASH_IT/themes/powerline/powerline.base.bash"
function __powerline_cwd_prompt { function __powerline_wd_prompt {
echo "\W|${CWD_THEME_PROMPT_COLOR}" echo "\W|${CWD_THEME_PROMPT_COLOR}"
} }
@ -15,8 +15,11 @@ function __powerline_left_segment {
function __powerline_prompt_command { function __powerline_prompt_command {
local last_status="$?" ## always the first local last_status="$?" ## always the first
local separator_char="${POWERLINE_PROMPT_CHAR}"
LEFT_PROMPT="" LEFT_PROMPT=""
SEGMENTS_AT_LEFT=0
LAST_SEGMENT_COLOR=""
## left prompt ## ## left prompt ##
for segment in $POWERLINE_PROMPT; do for segment in $POWERLINE_PROMPT; do
@ -24,10 +27,12 @@ function __powerline_prompt_command {
[[ -n "${info}" ]] && __powerline_left_segment "${info}" [[ -n "${info}" ]] && __powerline_left_segment "${info}"
done done
[[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status}) [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
[[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -) ${normal}" [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"
PS1="${LEFT_PROMPT}" PS1="${LEFT_PROMPT}"
## cleanup ## ## cleanup ##
unset LEFT_PROMPT unset LAST_SEGMENT_COLOR \
LEFT_PROMPT \
SEGMENTS_AT_LEFT
} }

View File

@ -33,7 +33,7 @@ LAST_STATUS_THEME_PROMPT_COLOR=52
CLOCK_THEME_PROMPT_COLOR=240 CLOCK_THEME_PROMPT_COLOR=240
BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="+ "} BATTERY_AC_CHAR=${BATTERY_AC_CHAR:=""}
BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70 BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160 BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
@ -43,6 +43,7 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
IN_VIM_THEME_PROMPT_COLOR=245 IN_VIM_THEME_PROMPT_COLOR=245
IN_VIM_THEME_PROMPT_TEXT="vim" IN_VIM_THEME_PROMPT_TEXT="vim"
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv cwd"} POWERLINE_PROMPT_CHAR="$ "
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv wd"}
safe_append_prompt_command __powerline_prompt_command safe_append_prompt_command __powerline_prompt_command