diff --git a/themes/redline/powerline.base.bash b/themes/redline/powerline.base.bash index ca066b5c..3a427c16 100644 --- a/themes/redline/powerline.base.bash +++ b/themes/redline/powerline.base.bash @@ -82,18 +82,24 @@ function __powerline_scm_prompt { scm_prompt_vars + # echo "${scm}" + if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then if [[ "${SCM_DIRTY}" -eq 3 ]]; then color=${SCM_THEME_PROMPT_STAGED_COLOR} fg_color=124 elif [[ "${SCM_DIRTY}" -eq 2 ]]; then color=${SCM_THEME_PROMPT_UNSTAGED_COLOR} - fg_color=255 + fg_color=56 elif [[ "${SCM_DIRTY}" -eq 1 ]]; then color=${SCM_THEME_PROMPT_DIRTY_COLOR} - else + fg_color=118 + elif [[ "${SCM_DIRTY}" -eq 0 ]]; then color=${SCM_THEME_PROMPT_CLEAN_COLOR} fg_color=16 + else + color=${SCM_THEME_PROMPT_COLOR} + fg_color=255 fi # if [[ "${SCM_BRANCH}" == "master" ]]; then # color=128 @@ -138,7 +144,7 @@ function __powerline_clock_prompt { function __powerline_battery_prompt { local color="" local battery_status="$(battery_percentage 2> /dev/null)" - local fg_color=206 + local fg_color=255 if [[ -z "${battery_status}" ]] || [[ "${battery_status}" = "-1" ]] || [[ "${battery_status}" = "no" ]]; then true diff --git a/themes/redline/redline.theme.bash b/themes/redline/redline.theme.bash index 3e9a64f4..e7cbf488 100644 --- a/themes/redline/redline.theme.bash +++ b/themes/redline/redline.theme.bash @@ -26,11 +26,13 @@ SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "} SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "} SCM_THEME_PROMPT_CLEAN=" ✓ " SCM_THEME_PROMPT_DIRTY=" ⨯ " +SCM_THEME_PROMPT_COLOR=91 SCM_THEME_PROMPT_CLEAN_COLOR=41 SCM_THEME_PROMPT_DIRTY_COLOR=94 SCM_THEME_PROMPT_STAGED_COLOR=220 #52 -SCM_THEME_PROMPT_UNSTAGED_COLOR=91 -SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR} +SCM_THEME_PROMPT_UNSTAGED_COLOR=81 +#SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR} + RVM_THEME_PROMPT_PREFIX="" RVM_THEME_PROMPT_SUFFIX="" @@ -60,7 +62,7 @@ IN_VIM_THEME_PROMPT_COLOR=245 IN_VIM_THEME_PROMPT_TEXT="vim" #POWERLINE_PROMPT=${POWERLINE_PROMPT:="python_venv ruby user_info hostname cwd scm"} -POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"} +#POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"} safe_append_prompt_command __powerline_prompt_command