Various powerlline enhancements and simplification

pull/1944/head
Konstantin Gredeskoul 2021-04-08 14:40:20 -07:00
parent 5dcb8243b7
commit f1fa5e0ccd
No known key found for this signature in database
GPG Key ID: F64DECB748F527EB
4 changed files with 527 additions and 373 deletions

View File

@ -0,0 +1,52 @@
#!/usr/bin/env bash
# vim: ft=bash:
# @author: Konstantin Gredeskoul
# @since: 04/08/2021
# @description Defines a functino for quickly changing theme color
function bashit.colorscheme() {
local scheme="$1"
[[ -z "${scheme}" ]] && {
if [[ "${ITERM_PROFILE}" =~ "Light" || "${ITERM_PROFILE}" =~ "light" ]]; then
export scheme=light
else
export scheme=dark
fi
}
local theme="${BASH_IT}/colorschemes/${scheme}.colorscheme.bash"
if [[ -f ${theme} ]]; then
source "${theme}"
else
echo "Invlaid theme name: ${scheme}, file ${theme} ain't a livin thang."
fi
}
function promptly.color() {
bashit.colorsscheme "$@"
}
export THEME_RUBRIC="ruby scm cwd | time "
function promptly() {
echo
}
function promptlyt() {
echo
}
function powerline.prompt.templates() {
local t=${1}
bashit.colorsscheme "$@"
}
powerline.prompt.git.default
powerline.prompt.left scm ruby cwd
powerline.prompt.right go clock battery
bashit.colorscheme dark

View File

@ -180,7 +180,7 @@ function scm_prompt_info_common {
{ [[ ${SCM} == "${SCM_SVN}" ]] && svn_prompt_info && return; } || true
}
function terraform_workspace_prompt() {
function terraform_workspace_prompt {
if _command_exists terraform; then
if [ -d .terraform ]; then
echo -e "$(terraform workspace show 2>/dev/null)"
@ -194,7 +194,7 @@ function active_gcloud_account_prompt {
fi
}
function git_prompt_minimal_info() {
function git_prompt_minimal_info {
SCM_STATE=${SCM_THEME_PROMPT_CLEAN}
_git-hide-status && return
@ -290,7 +290,7 @@ function git_prompt_vars {
SCM_CHANGE=$(_git-short-sha 2>/dev/null || echo "")
}
function p4_prompt_vars() {
function p4_prompt_vars {
IFS=$'\t' read -r \
opened_count non_default_changes default_count \
add_file_count edit_file_count delete_file_count \
@ -310,7 +310,7 @@ function p4_prompt_vars() {
SCM_SUFFIX=${P4_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
}
function svn_prompt_vars() {
function svn_prompt_vars {
if [[ -n $(svn status | head -c1 2>/dev/null) ]]; then
SCM_DIRTY=1
SCM_STATE=${SVN_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
@ -331,7 +331,7 @@ function svn_prompt_vars() {
# - lets say we cd into ~/Projects/Foo/Bar
# - .hg is located in ~/Projects/Foo/.hg
# - get_hg_root starts at ~/Projects/Foo/Bar and sees that there is no .hg directory, so then it goes into ~/Projects/Foo
function get_hg_root() {
function get_hg_root {
local CURRENT_DIR=$(pwd)
while [ "$CURRENT_DIR" != "/" ]; do
@ -344,7 +344,7 @@ function get_hg_root() {
done
}
function hg_prompt_vars() {
function hg_prompt_vars {
if [[ -n $(hg status 2>/dev/null) ]]; then
SCM_DIRTY=1
SCM_STATE=${HG_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
@ -372,7 +372,7 @@ function hg_prompt_vars() {
fi
}
function nvm_version_prompt() {
function nvm_version_prompt {
local node
if declare -f -F nvm &>/dev/null; then
node=$(nvm current 2>/dev/null)
@ -381,20 +381,11 @@ function nvm_version_prompt() {
fi
}
function npm_version_prompt() {
local node
if declare -f -F npm &>/dev/null; then
node=$(nvm current 2>/dev/null)
[[ "${node}" == "system" ]] && return
echo -e "${NVM_THEME_PROMPT_PREFIX}${node}${NVM_THEME_PROMPT_SUFFIX}"
fi
}
function node_version_prompt() {
function node_version_prompt {
echo -e "$(nvm_version_prompt)"
}
function rvm_version_prompt() {
function rvm_version_prompt {
if which rvm &>/dev/null; then
rvm=$(rvm-prompt) || return
if [ -n "$rvm" ]; then
@ -403,9 +394,9 @@ function rvm_version_prompt() {
fi
}
function rbenv_version_prompt() {
function rbenv_version_prompt {
if which rbenv &>/dev/null; then
rbenv=$(rbenv version-name) || return:
rbenv=$(rbenv version-name) || return
rbenv commands | grep -q gemset && gemset=$(rbenv gemset active 2>/dev/null) && rbenv="$rbenv@${gemset%% *}"
if [ "$rbenv" != "system" ]; then
echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
@ -413,13 +404,13 @@ function rbenv_version_prompt() {
fi
}
function rbfu_version_prompt() {
function rbfu_version_prompt {
if [[ $RBFU_RUBY_VERSION ]]; then
echo -e "${RBFU_THEME_PROMPT_PREFIX}${RBFU_RUBY_VERSION}${RBFU_THEME_PROMPT_SUFFIX}"
fi
}
function chruby_version_prompt() {
function chruby_version_prompt {
if declare -f -F chruby &>/dev/null; then
if declare -f -F chruby_auto &>/dev/null; then
chruby_auto
@ -434,39 +425,39 @@ function chruby_version_prompt() {
fi
}
function ruby_version_prompt() {
function ruby_version_prompt {
if [[ "${THEME_SHOW_RUBY_PROMPT}" = "true" ]]; then
echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
fi
}
function k8s_context_prompt() {
function k8s_context_prompt {
echo -e "$(kubectl config current-context 2>/dev/null)"
}
function virtualenv_prompt() {
function virtualenv_prompt {
if [[ -n "$VIRTUAL_ENV" ]]; then
virtualenv=$(basename "$VIRTUAL_ENV")
echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX"
fi
}
function condaenv_prompt() {
function condaenv_prompt {
if [[ $CONDA_DEFAULT_ENV ]]; then
echo -e "${CONDAENV_THEME_PROMPT_PREFIX}${CONDA_DEFAULT_ENV}${CONDAENV_THEME_PROMPT_SUFFIX}"
fi
}
function py_interp_prompt() {
function py_interp_prompt {
py_version=$(python --version 2>&1 | awk 'NR==1{print "py-"$2;}') || return
echo -e "${PYTHON_THEME_PROMPT_PREFIX}${py_version}${PYTHON_THEME_PROMPT_SUFFIX}"
}
function python_version_prompt() {
function python_version_prompt {
echo -e "$(virtualenv_prompt)$(condaenv_prompt)$(py_interp_prompt)"
}
function git_user_info() {
function git_user_info {
# support two or more initials, set by 'git pair' plugin
SCM_CURRENT_USER=$(git config user.initials | sed 's% %+%')
# if `user.initials` weren't set, attempt to extract initials from `user.name`
@ -474,7 +465,7 @@ function git_user_info() {
[[ -n "${SCM_CURRENT_USER}" ]] && printf "%s" "$SCM_THEME_CURRENT_USER_PREFFIX$SCM_CURRENT_USER$SCM_THEME_CURRENT_USER_SUFFIX"
}
function clock_char() {
function clock_char {
CLOCK_CHAR=${THEME_CLOCK_CHAR:-"⌚"}
CLOCK_CHAR_COLOR=${THEME_CLOCK_CHAR_COLOR:-"$normal"}
SHOW_CLOCK_CHAR=${THEME_SHOW_CLOCK_CHAR:-"true"}
@ -484,7 +475,7 @@ function clock_char() {
fi
}
function clock_prompt() {
function clock_prompt {
CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$normal"}
CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"}
[ -z "$THEME_SHOW_CLOCK" ] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-"true"}
@ -496,14 +487,14 @@ function clock_prompt() {
fi
}
function user_host_prompt() {
function user_host_prompt {
if [[ "${THEME_SHOW_USER_HOST}" = "true" ]]; then
echo -e "${USER_HOST_THEME_PROMPT_PREFIX}\u@\h${USER_HOST_THEME_PROMPT_SUFFIX}"
fi
}
# backwards-compatibility
function git_prompt_info() {
function git_prompt_info {
_git-hide-status && return
git_prompt_vars
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
@ -514,7 +505,7 @@ function p4_prompt_info() {
echo -e "${SCM_PREFIX}${SCM_BRANCH}:${SCM_CHANGE}${SCM_STATE}${SCM_SUFFIX}"
}
function svn_prompt_info() {
function svn_prompt_info {
svn_prompt_vars
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
}
@ -524,16 +515,16 @@ function hg_prompt_info() {
echo -e "${SCM_PREFIX}${SCM_BRANCH}:${SCM_CHANGE#*:}${SCM_STATE}${SCM_SUFFIX}"
}
function scm_char() {
function scm_char {
scm_prompt_char
echo -e "${SCM_THEME_CHAR_PREFIX}${SCM_CHAR}${SCM_THEME_CHAR_SUFFIX}"
}
function prompt_char() {
function prompt_char {
scm_char
}
function battery_char() {
function battery_char {
if [[ "${THEME_BATTERY_PERCENTAGE_CHECK}" = true ]]; then
echo -e "${bold_red}$(battery_percentage)%"
fi
@ -556,7 +547,7 @@ if ! _command_exists battery_percentage; then
}
fi
function aws_profile() {
function aws_profile {
if [[ $AWS_DEFAULT_PROFILE ]]; then
echo -e "${AWS_DEFAULT_PROFILE}"
else
@ -564,6 +555,33 @@ function aws_profile() {
fi
}
function npm_version_prompt() {
local node
if declare -f -F npm &>/dev/null; then
node=$(nvm current 2>/dev/null)
[[ "${node}" == "system" ]] && return
echo -e "${NVM_THEME_PROMPT_PREFIX}${node}${NVM_THEME_PROMPT_SUFFIX}"
fi
}
function prompt_colorscheme() {
[[ -z "${BASH_IT_COLORSCHEME}" ]] && return
local -a colorscheme_locations=(
"${HOME}/.${BASH_IT_COLORSCHEME}.colorscheme.bash"
"$BASH_IT/custom/${BASH_IT_COLORSCHEME}.colorscheme.bash"
"$BASH_IT/colorschemes/${BASH_IT_COLORSCHEME}.colorscheme.bash"
)
for scheme_file in ${colorscheme_locations[@]}; do
if [[ -f ${scheme_file} ]]; then
source "${scheme_file}"
fi
done
}
function __check_precmd_conflict() {
local f
for f in "${precmd_functions[@]}"; do
@ -574,38 +592,14 @@ function __check_precmd_conflict() {
return 1
}
function safe_append_prompt_command() {
local prompt_re
if [ "${__bp_imported}" == "defined" ]; then
# We are using bash-preexec
if ! __check_precmd_conflict "${1}"; then
precmd_functions+=("${1}")
fi
else
# Set OS dependent exact match regular expression
if [[ ${OSTYPE} == darwin* ]]; then
# macOS
prompt_re="[[:<:]]${1}[[:>:]]"
else
# Linux, FreeBSD, etc.
prompt_re="\<${1}\>"
fi
if [[ ${PROMPT_COMMAND} =~ ${prompt_re} ]]; then
return
elif [[ -z ${PROMPT_COMMAND} ]]; then
PROMPT_COMMAND="${1}"
else
PROMPT_COMMAND="${1};${PROMPT_COMMAND}"
fi
fi
function _save-and-reload-history() {
local autosave=${1:-0}
[[ $autosave -eq 1 ]] && history -a && history -c && history -r
}
function safe_append_prompt_command_kig() {
function safe_append_prompt_command {
local prompt_re
prompt_colorscheme
if [ "${__bp_imported}" == "defined" ]; then
# We are using bash-preexec
if ! __check_precmd_conflict "${1}"; then

View File

@ -11,7 +11,7 @@
# @description
# This function returns a shortened
# @see: https://stackoverflow.com/questions/1616678/bash-pwd-shortening
export POWERLINE_SHORT_CWD_WIDTH=30
export POWERLINE_SHORT_CWD_WIDTH=40
function cwd.shorten() {
local begin="" # The unshortened beginning of the path.
@ -19,7 +19,7 @@ function cwd.shorten() {
local current="" # The section of the path we're currently working on.
local end="${2:-$(pwd)}/" # The unmodified rest of the path.
if [[ "$end" =~ "${HOME}" ]]; then
if [[ "$end" =~ ${HOME} ]]; then
INHOME=1
end="${end#$HOME}" #strip /home/username from start of string
begin="$HOME" #start expansion from the right spot
@ -34,8 +34,7 @@ function cwd.shorten() {
shopt -q nullglob && NGV="-s" || NGV="-u" # Store the value for later.
shopt -s nullglob # Without this, anything that doesn't exist in the filesystem turns into */*/*/...
while [[ "$end" ]] && (( ${#shortenedpath} > maxlength ))
do
while [[ "$end" ]] && ((${#shortenedpath} > maxlength)); do
current="${end%%/*}" # everything before the first /
end="${end#*/}" # everything after the first /
@ -63,7 +62,7 @@ function cwd.shorten() {
echo "/$shortenedpath" # Make sure it starts with /
fi
shopt "$NGV" nullglob # Reset nullglob in case this is being used as a function.
shopt "$NGV" nullglob # Rerandomize nullglob in case this is being used as a function.
}
# Powerline Prompt Configuration
@ -75,7 +74,6 @@ function powerline.prompt.git.max() {
export SCM_GIT_SHOW_DETAILS=true
export SCM_GIT_SHOW_REMOTE_INFO=true
export SCM_GIT_SHOW_STASH_INFO=true
}
function powerline.prompt.git.min() {
@ -102,18 +100,18 @@ function powerline.prompt.git.default() {
local w
local os=$(uname -s)
if [[ $os == 'Darwin' ]]; then
w=$(stty -a 2>/dev/null | grep columns | awk '{print $6}');
w=$(stty -a 2>/dev/null | grep columns | awk '{print $6}')
else
w=$(stty -a 2>/dev/null | grep columns | awk '{print $7}' | sed -E 's/;//g');
w=$(stty -a 2>/dev/null | grep columns | awk '{print $7}' | sed -E 's/;//g')
fi
printf -- "%d" ${w}
printf -- "%d" "${w}"
}
# Filter/convert components passed as arguments to the
# correct powerline modules
# @example: .powerline.components ruby python k8 garbage
# @example: powerline.filter-and-print ruby python k8 garbages
# @output: ruby python_venv k8s_context
function .powerline.components() {
function powerline.filter-and-print() {
local -a components
components=()
for c in "$@"; do
@ -122,26 +120,98 @@ function .powerline.components() {
local func="__powerline_${c}_prompt"
type "$func" 2>/dev/null | head -1 | grep -q 'is a function' && components+=("${c}")
done
echo "${components[@]}"
echo "${components[*]}"
}
function .powerline.supported.components() {
set | grep -E '^__powerline_.*_prompt' | sed 's/__powerline_//g; s/_prompt.*$//g; s/^/ • /g'
function powerline.components.bulleted-list() {
set | grep -E '^__powerline_.*_prompt' | sed 's/__powerline_//g; s/_prompt.*$//g; s/^/ • /g' | sort
}
# usage: powerline.prompt.set [ lang [ lang ]... ]
# eg: powerline.prompt.set cwd ruby go node battery
function powerline.prompt.set() {
function powerline.components.array() {
set | grep -E '^__powerline_.*_prompt' | sed 's/__powerline_//g; s/_prompt.*$//g;' | tr '\n' ' '
echo
}
function powerline.invalid-arguments() {
echo -e "${echo_bold_red}ERROR:\n\tPlease pass an argument list of components " \
"you'd like to\n\tsee in the PROMPT.${echo_normal}\n"
echo -e "${echo_bold_yellow}\tHere is the list of all currently supported components:\n\t${echo_green}"
powerline.components.bulleted-list
echo -e "${echo_normal}"
}
function array.random-sort() {
local -a randomized
# shellcheck disable=2207
randomized=(
$(
for c in "$@"; do
echo "${c}"
done | sort -R | tr '\n' ' '
)
)
# shellcheck disable=2207
printf "%s" "${randomized[*]}"
}
# @description You can pass an array of the components either
# as a single space-separate string, of pass two
# strings for left/right components.
# @exmples
# # the first example will invoke powerline-multiline prompt:
# $ powerline.prompt.choose "cwd ruby go" "battery cpu time"
#
# # while the second will choose single line.
# $ powerline.prompt.choose "cwd ruby go node battery"
#
function powerline.prompt.choose() {
[[ -z "$*" ]] && {
echo -e "${echo_bold_red}Please pass an argument list of components you'd like to see in the PROMPT.${echo_reset_color}"
echo -e "${echo_bold_yellow}Here is the list of all currently supported components:${echo_green}\n"
.powerline.supported.components
echo -e "${echo_reset_color}"
return
powerline.invalid-arguments
echo
echo "Please note: you can pass the components as a single string,"
echo "or as two strings, in which case first one becomes left,"
echo "and the second becomes right component."
return 1
}
local left="$1"
local rigth="$2"
if [[ -z ${right} ]]; then
export BASH_IT_THEME="powerline"
else
export BASH_IT_THEME="powerline-multiline"
fi
for component_string in "left" "right"; do
local -a components
components=($(.powerline.components "$@"))
# shellcheck disable=2206
components=(${!component_string})
# shellcheck disable=2207
components=($(powerline.filter-and-print "${components[@]}"))
done
[[ -z ${right} ]] && {
# Single-line Powerline Prompts
export POWERLINE_PROMPT="${POWERLINE_LEFT_PROMPT}"
}
}
# usage: powerline.prompt.randomize [ lang [ lang ]... ]
# eg: powerline.prompt.randomize cwd ruby go node battery
function powerline.prompt.randomize() {
local -a components
local -a randomized
if [[ -z $* ]]; then
# shellcheck disable=2207
components=($(powerline.components.array))
else
# shellcheck disable=2207
components=($(powerline.filter-and-print "$@"))
fi
local count="${#components[@]}"
local half="$((count / 2))"
@ -154,44 +224,83 @@ function powerline.prompt.set() {
export POWERLINE_PROMPT="${components[*]}"
# Multiline Powerline Prompts
export POWERLINE_LEFT_PROMPT="${components[@]:0:${half_plus_one}}"
export POWERLINE_LEFT_PROMPT="${components[*]:0:${half_plus_one}}"
if ((even)); then
export POWERLINE_RIGHT_PROMPT="${components[@]:${half_plus_one}}"
export POWERLINE_RIGHT_PROMPT="${components[*]:${half_plus_one}}"
else
export POWERLINE_RIGHT_PROMPT="${components[@]:${half_plus_one}}"
export POWERLINE_RIGHT_PROMPT="${components[*]:${half_plus_one}}"
fi
}
function powerline.prompt.show() {
if [[ $BASH_IT_THEME =~ "multiline" ]]; then
powerline.prompt.set-left-to
powerline.prompt.set-right-to
echo "Left Side:"
powerline.prompt.echo-prompt left
echo "Right Side:"
powerline.prompt.side right
else
powerline.prompt.set-to
powerline.prompt.show-unified
fi
}
function powerline.prompt.set-to() {
# Print the prompt variable, either left/right or signle
function powerline.prompt.prompt-print() {
local side="$1"
local variable="$(powerline.prompt.variable "${side}")"
eval "echo ${!variable}"
}
# Print the prompt variable, either left/right or signle
function powerline.prompt.variable-name() {
local side="$1"
if [[ -z ${side} ]]; then
echo "POWERLINE_PROMPT"
else
echo "POWERLINE_${side^}_PROMPT"
fi
}
# @description Set left, right or the middle promps itts
function powerline.prompt.set() {
if [[ $BASH_IT_THEME =~ "multiline" ]]; then
local side="$1"; shift
if [[ ${side} == left || ${side} == right ]] ; then
echo "USAGE: powerline.prompt.side [ left | right ] <component.... >"
return 1
fi
local var="$(powerline.prompt.echo-prompt "${side}")"
if [[ -z $* ]]; then
echo "${POWERLINE_PROMPT}"
else
export POWERLINE_PROMPT="$(.powerline.components "$@")"
export POWERLINE_PROMPT="$(powerline.filter-and-print "$@")"
fi
fi
}
function powerline.prompt.set-right-to() {
function powerline.prompt.right() {
if [[ -z $* ]]; then
echo "${POWERLINE_RIGHT_PROMPT}"
else
export POWERLINE_RIGHT_PROMPT="$(.powerline.components "$@")"
export POWERLINE_RIGHT_PROMPT="$(powerline.filter-and-print "$@")"
fi
}
function powerline.prompt.set-left-to() {
function powerline.prompt.left() {
if [[ -z $* ]]; then
echo "${POWERLINE_LEFT_PROMPT}"
else
export POWERLINE_LEFT_PROMPT="$(.powerline.components "$@")"
export POWERLINE_LEFT_PROMPT="$(powerline.filter-and-print "$@")"
fi
}
function powerline.prompt.randomize-to() {
if [[ -z $* ]]; then
echo "${POWERLINE_PROMPT}"
else
export POWERLINE_PROMPT="$(powerline.filter-and-print "$@")"
fi
}
@ -200,10 +309,10 @@ function powerline.prompt.add-component() {
local side="$1"
local func
if [[ -n $1 ]]; then
func="powerline.prompt.set-${side}-to"
func="powerline.prompt.randomize-${side}-to"
shift
else
func="powerline.prompt.set-to"
func="powerline.prompt.randomize-to"
fi
${func} $(${func}) "$@"
@ -261,5 +370,4 @@ function powerline.prompt.alternative-symbols() {
export IN_VIM_THEME_PROMPT_TEXT="ⓥ "
export SHLVL_THEME_PROMPT_CHAR="ⓢ "
export COMMAND_NUMBER_THEME_PROMPT_CHAR="↳"
}