Merge pull request #417 from edubxb/powerline-multiline

Powerline-multiline improvements
pull/418/head
Eduardo Bellido Bellido 2015-03-05 19:52:41 +01:00
commit 87ba4761b5
1 changed files with 7 additions and 8 deletions

View File

@ -3,16 +3,16 @@
THEME_PROMPT_SEPARATOR="" THEME_PROMPT_SEPARATOR=""
THEME_PROMPT_LEFT_SEPARATOR="" THEME_PROMPT_LEFT_SEPARATOR=""
SHELL_SSH_CHAR=" " SHELL_SSH_CHAR=${SHELL_SSH_CHAR:=" "}
SHELL_THEME_PROMPT_COLOR=32 SHELL_THEME_PROMPT_COLOR=32
SHELL_SSH_THEME_PROMPT_COLOR=208
VIRTUALENV_CHAR="⒫ " VIRTUALENV_CHAR=${POWERLINE_VIRTUALENV_CHAR:="p "}
CONDA_VIRTUALENV_CHAR=${POWERLINE_CONDA_VIRTUALENV_CHAR:="c "}
VIRTUALENV_THEME_PROMPT_COLOR=35 VIRTUALENV_THEME_PROMPT_COLOR=35
SCM_NONE_CHAR="" SCM_NONE_CHAR=""
SCM_GIT_CHAR=" " SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
PROMPT_CHAR="" PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
SCM_THEME_PROMPT_CLEAN="" SCM_THEME_PROMPT_CLEAN=""
SCM_THEME_PROMPT_DIRTY="" SCM_THEME_PROMPT_DIRTY=""
@ -50,8 +50,7 @@ function set_rgb_color {
function powerline_shell_prompt { function powerline_shell_prompt {
SEGMENT_AT_RIGHT=0 SEGMENT_AT_RIGHT=0
if [[ -n "${SSH_CLIENT}" ]]; then if [[ -n "${SSH_CLIENT}" ]]; then
SHELL_PROMPT="${USER}@${HOSTNAME}" SHELL_PROMPT="${SHELL_SSH_CHAR}${USER}@${HOSTNAME}"
SHELL_THEME_PROMPT_COLOR="${SHELL_SSH_THEME_PROMPT_COLOR}"
else else
SHELL_PROMPT="${USER}" SHELL_PROMPT="${USER}"
fi fi
@ -66,7 +65,7 @@ function powerline_virtualenv_prompt {
if [[ -n "$CONDA_DEFAULT_ENV" ]]; then if [[ -n "$CONDA_DEFAULT_ENV" ]]; then
environ="$CONDA_DEFAULT_ENV" environ="$CONDA_DEFAULT_ENV"
VIRTUALENV_CHAR="⒞" VIRTUALENV_CHAR=${CONDA_VIRTUALENV_CHAR}
elif [[ -n "$VIRTUAL_ENV" ]]; then elif [[ -n "$VIRTUAL_ENV" ]]; then
environ=$(basename "$VIRTUAL_ENV") environ=$(basename "$VIRTUAL_ENV")
fi fi