parent
377f02714d
commit
a6e912854a
|
|
@ -62,6 +62,9 @@ SCM_SVN_CHAR='⑆'
|
||||||
SCM_NONE='NONE'
|
SCM_NONE='NONE'
|
||||||
SCM_NONE_CHAR='○'
|
SCM_NONE_CHAR='○'
|
||||||
|
|
||||||
|
NVM_THEME_PROMPT_PREFIX=' |'
|
||||||
|
NVM_THEME_PROMPT_SUFFIX='|'
|
||||||
|
|
||||||
RVM_THEME_PROMPT_PREFIX=' |'
|
RVM_THEME_PROMPT_PREFIX=' |'
|
||||||
RVM_THEME_PROMPT_SUFFIX='|'
|
RVM_THEME_PROMPT_SUFFIX='|'
|
||||||
|
|
||||||
|
|
@ -306,6 +309,19 @@ function hg_prompt_vars {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function nvm_version_prompt {
|
||||||
|
local node
|
||||||
|
if declare -f -F nvm &> /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 {
|
||||||
|
echo -e "$(nvm_version_prompt)"
|
||||||
|
}
|
||||||
|
|
||||||
function rvm_version_prompt {
|
function rvm_version_prompt {
|
||||||
if which rvm &> /dev/null; then
|
if which rvm &> /dev/null; then
|
||||||
rvm=$(rvm-prompt) || return
|
rvm=$(rvm-prompt) || return
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
|
||||||
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
||||||
and `conda` supported)
|
and `conda` supported)
|
||||||
* `ruby` - Current ruby version if using `rvm`
|
* `ruby` - Current ruby version if using `rvm`
|
||||||
|
* `node` - Current node version (only `nvm` is supported)
|
||||||
* `scm` - Version control information, `git`
|
* `scm` - Version control information, `git`
|
||||||
* `user_info` - Current user
|
* `user_info` - Current user
|
||||||
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
|
||||||
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
||||||
SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
|
SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
|
||||||
|
|
||||||
|
NVM_THEME_PROMPT_PREFIX=""
|
||||||
|
NVM_THEME_PROMPT_SUFFIX=""
|
||||||
|
NODE_THEME_PROMPT_COLOR=22
|
||||||
|
NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
|
||||||
|
|
||||||
RVM_THEME_PROMPT_PREFIX=""
|
RVM_THEME_PROMPT_PREFIX=""
|
||||||
RVM_THEME_PROMPT_SUFFIX=""
|
RVM_THEME_PROMPT_SUFFIX=""
|
||||||
RBENV_THEME_PROMPT_PREFIX=""
|
RBENV_THEME_PROMPT_PREFIX=""
|
||||||
|
|
@ -57,7 +62,7 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
|
||||||
|
|
||||||
HOST_THEME_PROMPT_COLOR=0
|
HOST_THEME_PROMPT_COLOR=0
|
||||||
|
|
||||||
POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby cwd"}
|
POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
|
||||||
POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
|
POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
|
||||||
|
|
||||||
safe_append_prompt_command __powerline_prompt_command
|
safe_append_prompt_command __powerline_prompt_command
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
|
||||||
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
||||||
and `conda` supported)
|
and `conda` supported)
|
||||||
* `ruby` - Current ruby version if using `rvm`
|
* `ruby` - Current ruby version if using `rvm`
|
||||||
|
* `node` - Current node version (only `nvm` is supported)
|
||||||
* `scm` - Version control information, `git`
|
* `scm` - Version control information, `git`
|
||||||
* `user_info` - Current user
|
* `user_info` - Current user
|
||||||
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
|
||||||
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
||||||
SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
|
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=22
|
||||||
|
|
||||||
RVM_THEME_PROMPT_PREFIX=""
|
RVM_THEME_PROMPT_PREFIX=""
|
||||||
RVM_THEME_PROMPT_SUFFIX=""
|
RVM_THEME_PROMPT_SUFFIX=""
|
||||||
RBENV_THEME_PROMPT_PREFIX=""
|
RBENV_THEME_PROMPT_PREFIX=""
|
||||||
|
|
@ -57,6 +62,6 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
|
||||||
|
|
||||||
HOST_THEME_PROMPT_COLOR=254
|
HOST_THEME_PROMPT_COLOR=254
|
||||||
|
|
||||||
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
|
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
|
||||||
|
|
||||||
safe_append_prompt_command __powerline_prompt_command
|
safe_append_prompt_command __powerline_prompt_command
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
|
||||||
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
||||||
and `conda` supported)
|
and `conda` supported)
|
||||||
* `ruby` - Current ruby version if using `rvm`
|
* `ruby` - Current ruby version if using `rvm`
|
||||||
|
* `node` - Current node version (only `nvm` is supported)
|
||||||
* `scm` - Version control information, `git`
|
* `scm` - Version control information, `git`
|
||||||
* `user_info` - Current user
|
* `user_info` - Current user
|
||||||
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
|
||||||
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
||||||
SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
|
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=22
|
||||||
|
|
||||||
RVM_THEME_PROMPT_PREFIX=""
|
RVM_THEME_PROMPT_PREFIX=""
|
||||||
RVM_THEME_PROMPT_SUFFIX=""
|
RVM_THEME_PROMPT_SUFFIX=""
|
||||||
RBENV_THEME_PROMPT_PREFIX=""
|
RBENV_THEME_PROMPT_PREFIX=""
|
||||||
|
|
@ -52,6 +57,6 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
|
||||||
|
|
||||||
HOST_THEME_PROMPT_COLOR=0
|
HOST_THEME_PROMPT_COLOR=0
|
||||||
|
|
||||||
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
|
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
|
||||||
|
|
||||||
safe_append_prompt_command __powerline_prompt_command
|
safe_append_prompt_command __powerline_prompt_command
|
||||||
|
|
@ -56,6 +56,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
|
||||||
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
|
||||||
and `conda` supported)
|
and `conda` supported)
|
||||||
* `ruby` - Current ruby version if using `rvm`
|
* `ruby` - Current ruby version if using `rvm`
|
||||||
|
* `node` - Current node version (only `nvm` is supported)
|
||||||
* `scm` - Version control information, `git`
|
* `scm` - Version control information, `git`
|
||||||
* `user_info` - Current user
|
* `user_info` - Current user
|
||||||
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
* `wd` - Working directory, like `cwd` but doesn't show the full folder
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,13 @@ function __powerline_user_info_prompt {
|
||||||
[[ -n "${user_info}" ]] && echo "${user_info}|${color}"
|
[[ -n "${user_info}" ]] && echo "${user_info}|${color}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function __powerline_node_prompt {
|
||||||
|
local node_version=""
|
||||||
|
|
||||||
|
node_version="$(node_version_prompt)"
|
||||||
|
[[ -n "${node_version}" ]] && echo "${NODE_CHAR}${node_version}|${NODE_THEME_PROMPT_COLOR}"
|
||||||
|
}
|
||||||
|
|
||||||
function __powerline_ruby_prompt {
|
function __powerline_ruby_prompt {
|
||||||
local ruby_version=""
|
local ruby_version=""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
|
||||||
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
SCM_THEME_PROMPT_UNSTAGED_COLOR=92
|
||||||
SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
|
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=22
|
||||||
|
|
||||||
RVM_THEME_PROMPT_PREFIX=""
|
RVM_THEME_PROMPT_PREFIX=""
|
||||||
RVM_THEME_PROMPT_SUFFIX=""
|
RVM_THEME_PROMPT_SUFFIX=""
|
||||||
RBENV_THEME_PROMPT_PREFIX=""
|
RBENV_THEME_PROMPT_PREFIX=""
|
||||||
|
|
@ -55,7 +60,7 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
|
||||||
|
|
||||||
HOST_THEME_PROMPT_COLOR=0
|
HOST_THEME_PROMPT_COLOR=0
|
||||||
|
|
||||||
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
|
POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
|
||||||
|
|
||||||
HISTORY_AUTOSAVE=${HISTORY_AUTOSAVE:-0}
|
HISTORY_AUTOSAVE=${HISTORY_AUTOSAVE:-0}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue