Merge branch 'master' of https://github.com/bash-it/bash-it into ira/autosave-history-plml

* 'master' of https://github.com/bash-it/bash-it:
  feat: add k8s namespace indicator (#1887)
  Add command duration to the powerline theme family

Author: seefood

docs/themes-list/powerline-base.rst

@@ -70,11 +70,13 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
 * ``clock`` - Current time in ``HH:MM:SS`` format
 * ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
+* ``duration`` - Duration of the last command. See :ref:`Command duration <command_duration>` for details.
 * ``gcloud`` - Current gcloud active account
 * ``hostname`` - Host name of machine
 * ``in_toolbox`` - Show identifier if running inside a `toolbox <https://github.com/containers/toolbox>`_
 * ``in_vim`` - Show identifier if running in ``:terminal`` from vim
 * ``k8s_context`` - Show current kubernetes context
+* ``k8s_namespace`` - Show current kubernetes namespace
 * ``last_status`` - Exit status of last run command
 * ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
   and ``conda`` supported)

themes/base.theme.bash

@@ -437,6 +437,10 @@ function k8s_context_prompt {
 	echo -e "$(kubectl config current-context 2> /dev/null)"
 }
 
+function k8s_namespace_prompt {
+	echo -e "$(kubectl config view --minify --output 'jsonpath={..namespace}' 2> /dev/null)"
+}
+
 function virtualenv_prompt {
 	if [[ -n "$VIRTUAL_ENV" ]]; then
 		virtualenv=$(basename "$VIRTUAL_ENV")

themes/powerline-multiline/powerline-multiline.theme.bash

@@ -55,6 +55,9 @@ TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
+KUBERNETES_NAMESPACE_THEME_CHAR=${POWERLINE_KUBERNETES_NAMESPACE_CHAR:="⎈ "}
+KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_NAMESPACE_COLOR:=64}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
@@ -94,6 +97,8 @@ COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
 GCLOUD_THEME_PROMPT_COLOR=${POWERLINE_GCLOUD_COLOR:=161}
 GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
 
+COMMAND_DURATION_PROMPT_COLOR=${POWERLINE_COMMAND_DURATION_COLOR:=129}
+
 POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
 POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
 

themes/powerline-naked/powerline-naked.theme.bash

@@ -50,6 +50,9 @@ TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
+KUBERNETES_NAMESPACE_THEME_CHAR=${POWERLINE_KUBERNETES_NAMESPACE_CHAR:="⎈ "}
+KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_NAMESPACE_COLOR:=64}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 

themes/powerline-plain/powerline-plain.theme.bash

@@ -47,6 +47,9 @@ TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
+KUBERNETES_NAMESPACE_THEME_CHAR=${POWERLINE_KUBERNETES_NAMESPACE_CHAR:="⎈ "}
+KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_NAMESPACE_COLOR:=60}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 

themes/powerline/powerline.base.bash

@@ -85,6 +85,16 @@ function __powerline_k8s_context_prompt() {
 	[[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR}"
 }
 
+function __powerline_k8s_namespace_prompt() {
+	local kubernetes_namespace=""
+
+	if _command_exists kubectl; then
+		kubernetes_namespace="$(k8s_namespace_prompt)"
+	fi
+
+	[[ -n "${kubernetes_namespace}" ]] && echo "${KUBERNETES_NAMESPACE_THEME_CHAR}${kubernetes_namespace}|${KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR}"
+}
+
 function __powerline_python_venv_prompt() {
 	set +u
 	local python_venv=""
@@ -210,6 +220,11 @@ function __powerline_command_number_prompt() {
 	echo "${COMMAND_NUMBER_THEME_PROMPT_CHAR}\#|${COMMAND_NUMBER_THEME_PROMPT_COLOR}"
 }
 
+function __powerline_duration_prompt() {
+	local duration=$(_command_duration)
+	[[ -n "$duration" ]] && echo "${duration}|${COMMAND_DURATION_PROMPT_COLOR}"
+}
+
 function __powerline_left_segment() {
 	local params
 	IFS="|" read -ra params <<< "${1}"

themes/powerline/powerline.theme.bash

@@ -52,6 +52,9 @@ TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
+KUBERNETES_NAMESPACE_THEME_CHAR=${POWERLINE_KUBERNETES_NAMESPACE_CHAR:="⎈ "}
+KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_NAMESPACE_COLOR:=64}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
@@ -91,6 +94,8 @@ COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
 GCLOUD_THEME_PROMPT_COLOR=${POWERLINE_GCLOUD_COLOR:=161}
 GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
 
+COMMAND_DURATION_PROMPT_COLOR=${POWERLINE_COMMAND_DURATION_COLOR:=129}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command