powerline-no

This commit is contained in:
Geoffrey Frogeye 2020-08-08 11:33:43 +02:00
parent f03d13f7db
commit af463d0f77
Signed by: geoffrey
GPG key ID: D8A7ECA00A8CD3DD
2 changed files with 48 additions and 37 deletions

View file

@ -13,26 +13,32 @@ HISTCONTROL=ignoreboth:erasedups
# Prompt customization # Prompt customization
INTERACTIVE_BASHPID_TIMER="${HOME}/.cache/bash_timer_$$" if command -v powerline-go > /dev/null
then
INTERACTIVE_BASHPID_TIMER="${HOME}/.cache/bash_timer_$$"
PS0='$(echo $SECONDS > "$INTERACTIVE_BASHPID_TIMER")' PS0='$(echo $SECONDS > "$INTERACTIVE_BASHPID_TIMER")'
function _update_ps1() { function _update_ps1() {
local __ERRCODE=$? local __ERRCODE=$?
local __DURATION=0 local __DURATION=0
if [ -e "$INTERACTIVE_BASHPID_TIMER" ]; then if [ -e "$INTERACTIVE_BASHPID_TIMER" ]; then
local __END=$SECONDS local __END=$SECONDS
local __START=$(cat "$INTERACTIVE_BASHPID_TIMER") local __START=$(cat "$INTERACTIVE_BASHPID_TIMER")
__DURATION="$(($__END - ${__START:-__END}))" __DURATION="$(($__END - ${__START:-__END}))"
\rm -f "$INTERACTIVE_BASHPID_TIMER" \rm -f "$INTERACTIVE_BASHPID_TIMER"
fi fi
# echo -en "… $\r" # echo -en "… $\r"
eval "$(powerline-go -shell bash -eval -duration $__DURATION -error $__ERRCODE "${POWERLINE_GO_DEFAULT_OPTS[@]}")" eval "$(powerline-go -shell bash -eval -duration $__DURATION -error $__ERRCODE "${POWERLINE_GO_DEFAULT_OPTS[@]}")"
} }
PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
else
export PS1="\[\e]2;\u@\H \w\a\]\[\e[0;37m\][\[\e[0;${col}m\]\u\[\e[0;37m\]@\[\e[0;34m\]\h \[\e[0;36m\]\W\[\e[0;37m\]]\$\[\e[0m\] "
fi
# Completion # Completion
trysource /usr/share/bash-completion/bash_completion trysource /usr/share/bash-completion/bash_completion

View file

@ -48,31 +48,36 @@ function preexec() {
__TIMER=$EPOCHREALTIME __TIMER=$EPOCHREALTIME
} }
function powerline_precmd() { if command -v powerline-go > /dev/null
local __ERRCODE=$? then
local __DURATION=0 function powerline_precmd() {
local __ERRCODE=$?
local __DURATION=0
if [ -n $__TIMER ]; then if [ -n $__TIMER ]; then
local __ERT=$EPOCHREALTIME local __ERT=$EPOCHREALTIME
__DURATION="$(($__ERT - ${__TIMER:-__ERT}))" __DURATION="$(($__ERT - ${__TIMER:-__ERT}))"
fi
echo -en "\033]; ${USER}@${HOST} $PWD\007"
# echo -en "… $\r"
eval "$(powerline-go -shell zsh -eval -duration $__DURATION -error $__ERRCODE "${POWERLINE_GO_DEFAULT_OPTS[@]}")"
unset __TIMER
}
function install_powerline_precmd() {
for s in "${precmd_functions[@]}"; do
if [ "$s" = "powerline_precmd" ]; then
return
fi fi
done
precmd_functions+=(powerline_precmd)
}
install_powerline_precmd echo -en "\033]; ${USER}@${HOST} $PWD\007"
# echo -en "… $\r"
eval "$(powerline-go -shell zsh -eval -duration $__DURATION -error $__ERRCODE "${POWERLINE_GO_DEFAULT_OPTS[@]}")"
unset __TIMER
}
function install_powerline_precmd() {
for s in "${precmd_functions[@]}"; do
if [ "$s" = "powerline_precmd" ]; then
return
fi
done
precmd_functions+=(powerline_precmd)
}
install_powerline_precmd
else
export PS1="\[\e]2;\u@\H \w\a\]\[\e[0;37m\][\[\e[0;${col}m\]\u\[\e[0;37m\]@\[\e[0;34m\]\h \[\e[0;36m\]\W\[\e[0;37m\]]\$\[\e[0m\] "
fi
# Cursor based on mode # Cursor based on mode
if [ $TERM = "linux" ]; then if [ $TERM = "linux" ]; then