XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 988d499aa1 into f121bec2a1

pull/1212/merge
Andrés C. Viesca Ruiz 2018-07-13 08:02:44 +00:00 committed by GitHub
parent f121bec2a1 988d499aa1
commit 9413369c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
themes/atomic/atomic.theme.bash
View File

@ -146,6 +146,14 @@ ___atomic_prompt_ruby() {
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red}" "${box}" printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red}" "${box}"
} }
___atomic_prompt_node() {
[ "${THEME_SHOW_NODE}" != "true" ] && return
color=$bold_green
box="[|]"
info="node 👻 $(node_version_prompt)"
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
}
___atomic_prompt_todo() { ___atomic_prompt_todo() {
[ "${THEME_SHOW_TODO}" != "true" ] || [ "${THEME_SHOW_TODO}" != "true" ] ||
[ -z "$(which todo.sh)" ] && return [ -z "$(which todo.sh)" ] && return
@ -223,7 +231,7 @@ _atomic_completion() {
cur="${COMP_WORDS[COMP_CWORD]}" cur="${COMP_WORDS[COMP_CWORD]}"
_action="${COMP_WORDS[1]}" _action="${COMP_WORDS[1]}"
actions="show hide" actions="show hide"
segments="battery clock exitcode python ruby scm sudo todo" segments="battery clock exitcode python ruby node scm sudo todo"
case "${_action}" in case "${_action}" in
show) show)
COMPREPLY=( $(compgen -W "${segments}" -- "${cur}") ) COMPREPLY=( $(compgen -W "${segments}" -- "${cur}") )
@ -278,8 +286,9 @@ export SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
THEME_SHOW_SUDO=${THEME_SHOW_SUDO:-"true"} THEME_SHOW_SUDO=${THEME_SHOW_SUDO:-"true"}
THEME_SHOW_SCM=${THEME_SHOW_SCM:-"true"} THEME_SHOW_SCM=${THEME_SHOW_SCM:-"true"}
THEME_SHOW_RUBY=${THEME_SHOW_RUBY:-"false"} THEME_SHOW_RUBY=${THEME_SHOW_RUBY:-"false"}
THEME_SHOW_NODE=${THEME_SHOW_NODE:-"true"}
THEME_SHOW_PYTHON=${THEME_SHOW_PYTHON:-"false"} THEME_SHOW_PYTHON=${THEME_SHOW_PYTHON:-"false"}
THEME_SHOW_CLOCK=${THEME_SHOW_CLOCK:-"true"} THEME_SHOW_CLOCK=${THEME_SHOW_CLOCK:-"false"}
THEME_SHOW_TODO=${THEME_SHOW_TODO:-"false"} THEME_SHOW_TODO=${THEME_SHOW_TODO:-"false"}
THEME_SHOW_BATTERY=${THEME_SHOW_BATTERY:-"true"} THEME_SHOW_BATTERY=${THEME_SHOW_BATTERY:-"true"}
THEME_SHOW_EXITCODE=${THEME_SHOW_EXITCODE:-"false"} THEME_SHOW_EXITCODE=${THEME_SHOW_EXITCODE:-"false"}
@ -294,7 +303,7 @@ __ATOMIC_PROMPT_CHAR_PS1_SUDO=${THEME_PROMPT_CHAR_PS1_SUDO:-"${normal}${LineB}${
__ATOMIC_PROMPT_CHAR_PS2_SUDO=${THEME_PROMPT_CHAR_PS2_SUDO:-"${normal}${LineB}${bold_red}${Face}"} __ATOMIC_PROMPT_CHAR_PS2_SUDO=${THEME_PROMPT_CHAR_PS2_SUDO:-"${normal}${LineB}${bold_red}${Face}"}
___ATOMIC_TOP_LEFT=${___ATOMIC_TOP_LEFT:-"user_info dir scm"} ___ATOMIC_TOP_LEFT=${___ATOMIC_TOP_LEFT:-"user_info dir scm"}
___ATOMIC_TOP_RIGHT=${___ATOMIC_TOP_RIGHT:-"exitcode python ruby todo clock battery"} ___ATOMIC_TOP_RIGHT=${___ATOMIC_TOP_RIGHT:-"exitcode python ruby node todo clock battery"}
___ATOMIC_BOTTOM=${___ATOMIC_BOTTOM:-"char"} ___ATOMIC_BOTTOM=${___ATOMIC_BOTTOM:-"char"}
############ ############

5
themes/base.theme.bash
View File

@ -355,6 +355,11 @@ function python_version_prompt {
echo -e "$(virtualenv_prompt)$(condaenv_prompt)$(py_interp_prompt)" echo -e "$(virtualenv_prompt)$(condaenv_prompt)$(py_interp_prompt)"
} }
function node_version_prompt {
node_version=$(node -v)
echo -e "${node_version}"
}
function git_user_info { function git_user_info {
# support two or more initials, set by 'git pair' plugin # support two or more initials, set by 'git pair' plugin
SCM_CURRENT_USER=$(git config user.initials | sed 's% %+%') SCM_CURRENT_USER=$(git config user.initials | sed 's% %+%')