diff --git a/themes/base.theme.bash b/themes/base.theme.bash index 92a56e5ec0..1b170307f8 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -390,6 +390,27 @@ function hg_prompt_vars() { fi } +function node_command_version_prompt() { + local node_version + if _command_exists node; then + node_version="$(node --version 2> /dev/null)" + if [[ -n ${node_version} ]]; then + echo -e "${NVM_THEME_PROMPT_PREFIX}${node_version}${NVM_THEME_PROMPT_SUFFIX}" + fi + fi +} + +function node_version_prompt() { + local node_version + node_version="$(nvm_version_prompt)" + if [[ -z "${node_version}" ]]; then + node_version="$(node_command_version_prompt)" + fi + if [[ -n "${node_version}" ]]; then + echo -e "${node_version}" + fi +} + function nvm_version_prompt() { local node if _is_function nvm; then @@ -399,10 +420,6 @@ function nvm_version_prompt() { fi } -function node_version_prompt() { - nvm_version_prompt -} - function rvm_version_prompt() { if _command_exists rvm; then rvm="$(rvm-prompt)" || return diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash index 48a1243e03..c716a5b9b2 100644 --- a/themes/powerline-multiline/powerline-multiline.theme.bash +++ b/themes/powerline-multiline/powerline-multiline.theme.bash @@ -40,13 +40,13 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR} NVM_THEME_PROMPT_PREFIX="" NVM_THEME_PROMPT_SUFFIX="" NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "} -NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22} +NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=28} RVM_THEME_PROMPT_PREFIX="" RVM_THEME_PROMPT_SUFFIX="" RBENV_THEME_PROMPT_PREFIX="" RBENV_THEME_PROMPT_SUFFIX="" -RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161} +RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=1} RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "} TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}