From f99ccbd1f20e2671821669458b5b704fecb3ed00 Mon Sep 17 00:00:00 2001 From: Zanark Date: Fri, 18 Oct 2019 11:13:19 +0530 Subject: [PATCH] Removed redundant code and added some descriptive comments --- themes/gitline/gitline.theme.bash | 12 ++++++------ themes/gitline/powerline.base.bash | 10 ++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash index 425c5897..3e6be360 100644 --- a/themes/gitline/gitline.theme.bash +++ b/themes/gitline/gitline.theme.bash @@ -2,7 +2,7 @@ . "$BASH_IT/themes/redline/powerline.base.bash" -#For the logo +#For the logo(Uncomment if you want a logo before your name) #PROMPT_DISTRO_LOGO="šŸ’»" PROMPT_DISTRO_LOGO_COLOR=15 PROMPT_DISTRO_LOGO_COLORBG=52 @@ -17,10 +17,12 @@ USER_INFO_SUDO_CHAR=${POWERLINE_USER_INFO_SUDO_CHAR:="ī˜” "} USER_INFO_THEME_PROMPT_COLOR=91 USER_INFO_THEME_PROMPT_COLOR_SUDO=1 +#PYTHON VENV PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ī˜† "} CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="ā²cā³ "} PYTHON_VENV_THEME_PROMPT_COLOR=17 +#GIT Prompt Symbols SCM_NONE_CHAR="" SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:="ī‚  "} SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "} @@ -31,9 +33,8 @@ SCM_THEME_PROMPT_CLEAN_COLOR=41 SCM_THEME_PROMPT_DIRTY_COLOR=94 SCM_THEME_PROMPT_STAGED_COLOR=220 #52 SCM_THEME_PROMPT_UNSTAGED_COLOR=81 -#SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR} - +#Ruby Prompt Symbols RVM_THEME_PROMPT_PREFIX="" RVM_THEME_PROMPT_SUFFIX="" RBENV_THEME_PROMPT_PREFIX="" @@ -49,8 +50,10 @@ HOST_THEME_PROMPT_COLOR=88 LAST_STATUS_THEME_PROMPT_COLOR=52 +#Clock CLOCK_THEME_PROMPT_COLOR=240 +#For Battery Plugin BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚔"} BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208 @@ -61,8 +64,5 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"} 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"} - safe_append_prompt_command __powerline_prompt_command diff --git a/themes/gitline/powerline.base.bash b/themes/gitline/powerline.base.bash index 925791fc..45387b02 100644 --- a/themes/gitline/powerline.base.bash +++ b/themes/gitline/powerline.base.bash @@ -1,4 +1,4 @@ -# Define this here so it can be used by all of the Powerline themes +# Sudo check after every command THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true} #To set color for foreground and background @@ -75,7 +75,7 @@ function __powerline_python_venv_prompt { [[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}|${fg_color}" } -#Customising SCM Prompt +#Customising SCM(GIT) Prompt function __powerline_scm_prompt { local color="" local scm_prompt="" @@ -83,7 +83,6 @@ function __powerline_scm_prompt { scm_prompt_vars - # echo "${scm}" if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then if [[ "${SCM_DIRTY}" -eq 3 ]]; then @@ -102,10 +101,6 @@ function __powerline_scm_prompt { color=${SCM_THEME_PROMPT_COLOR} fg_color=255 fi - # if [[ "${SCM_BRANCH}" == "master" ]]; then - # color=128 - # fg_color=251 - # fi if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}" elif [[ "${SCM_P4_CHAR}" == "${SCM_CHAR}" ]]; then @@ -191,7 +186,6 @@ function __powerline_left_segment { separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}" fi #change here to cahnge fg color - #echo "${params[0]} -> ${params[1]} -> ${params[2]}" LEFT_PROMPT+="${separator}$(set_color ${params[2]} ${params[1]}) ${params[0]} ${normal}" #seperator char color = current bg LAST_SEGMENT_COLOR=${params[1]}