lloeki/dotfiles
1
0
Fork 0
mirror of https://github.com/lloeki/dotfiles.git synced 2025-12-06 07:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

WIP: moving prompt segments out of zsh

Browse source
This commit is contained in:
Loic Nageleisen 2013-12-19 17:01:42 +01:00
parent b398a6c739
commit cc536c39cc
5 changed files with 179 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

117
zsh/prompt
View file

@ -1,118 +1,5 @@
#source $DOTFILES_ZSH_DIR/prompt_vcs
#POWERLINE_TRI_LEFT_FULL=''
#POWERLINE_TRI_LEFT_EMPTY=''
#POWERLINE_TRI_RIGHT_FULL=''
#POWERLINE_TRI_RIGHT_EMPTY=''
#POWERLINE_BRANCH=''
#POWERLINE_LN=''
#POWERLINE_LOCK=''
#POWERLINE_ASIDE='➦'
POWERLINE_TRI_LEFT_FULL='⮂'
POWERLINE_TRI_LEFT_EMPTY='⮃'
POWERLINE_TRI_RIGHT_FULL='⮀'
POWERLINE_TRI_RIGHT_EMPTY='⮁'
POWERLINE_BRANCH=''
POWERLINE_LN='⭡'
POWERLINE_LOCK='⭤'
POWERLINE_ASIDE='➦'
UNICODE_BOX_VERTICAL_BAR='│'
prompt_is_fancy() {
[[ $PROMPT_FANCY -eq 1 ]]
}
prompt_setup_segments() {
if prompt_is_fancy; then
SEGMENT_SEPARATOR=$POWERLINE_TRI_RIGHT_FULL
RSEGMENT_SEPARATOR=$POWERLINE_TRI_LEFT_FULL
SUBSEGMENT_SEPARATOR=$POWERLINE_TRI_RIGHT_EMPTY
RSUBSEGMENT_SEPARATOR=$POWERLINE_TRI_LEFT_EMPTY
else
SEGMENT_SEPARATOR=''
RSEGMENT_SEPARATOR=''
SUBSEGMENT_SEPARATOR=$UNICODE_BOX_VERTICAL_BAR
RSUBSEGMENT_SEPARATOR=$SUBSEGMENT_SEPARATOR
fi
}
SEGMENT_DEFAULT_BG=15
#SEGMENT_DEFAULT_BG=0
SEGMENT_DEFAULT_FG=14
prompt_segment() {
[[ -z $RPROMPT_SEGMENT ]] && lprompt_segment $@ || rprompt_segment $@
}
lprompt_segment() {
local bg fg fake_bg
[[ -n $1 ]] && bg="$1" || bg='default'
[[ -n $2 ]] && fg="$2" || fg='default'
if [[ $CURRENT_BG == 'default' ]]; then
fake_bg=$SEGMENT_DEFAULT_BG
else
fake_bg=$CURRENT_BG
fi
if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
echo -n " %{%K{$bg}%F{$fake_bg}%}$SEGMENT_SEPARATOR%{%F{$fg}%} "
else
echo -n "%{%K{$bg}%}%{%F{$fg}%} "
fi
CURRENT_BG=$1
[[ -n $3 ]] && print -Pn $3
}
prompt_subsegment() {
echo -n " $SUBSEGMENT_SEPARATOR "
[[ -n $1 ]] && print -Pn $1
}
# End the prompt, closing any open segments
prompt_end() {
if [[ -n $CURRENT_BG ]]; then
echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
else
echo -n "%{%k%}"
fi
echo -n "%{%f%}"
CURRENT_BG=''
}
rprompt_segment() {
local bg fg fake_bg prev_bg
[[ -n $1 ]] && bg="$1" || bg='default'
[[ -n $2 ]] && fg="$2" || fg='default'
if [[ $bg == 'default' ]]; then
fake_bg=$SEGMENT_DEFAULT_BG
else
fake_bg=$bg
fi
prev_bg=$CURRENT_BG
if [[ $1 != $CURRENT_BG ]]; then
echo -n " %{%K{$prev_bg}%F{$fake_bg}%}$RSEGMENT_SEPARATOR%{%K{$bg}%F{$fg}%} "
else
echo -n "%{%K{$bg}%}%{%F{$fg}%} "
fi
CURRENT_BG=$1
[[ -n $3 ]] && print -Pn $3
}
rprompt_end() {
echo -n ' '
echo -n "%{%k%f%}"
CURRENT_BG=''
}
source "$DOTFILES_SHELL_DIR/prompt_segments"
source "$DOTFILES_ZSH_DIR/prompt_segments"
prompt_host() {
if [[ $UID -eq 0 ]]; then

66
zsh/prompt_segments Normal file
View file

@ -0,0 +1,66 @@
SEGMENT_DEFAULT_BG=15
#SEGMENT_DEFAULT_BG=0
SEGMENT_DEFAULT_FG=14
lprompt_segment() {
local bg fg fake_bg
[[ -n $1 ]] && bg="$1" || bg='default'
[[ -n $2 ]] && fg="$2" || fg='default'
if [[ $CURRENT_BG == 'default' ]]; then
fake_bg=$SEGMENT_DEFAULT_BG
else
fake_bg=$CURRENT_BG
fi
if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
echo -n " %{%K{$bg}%F{$fake_bg}%}$SEGMENT_SEPARATOR%{%F{$fg}%} "
else
echo -n "%{%K{$bg}%}%{%F{$fg}%} "
fi
CURRENT_BG=$1
[[ -n $3 ]] && print -Pn $3
}
# End the prompt, closing any open segments
prompt_end() {
if [[ -n $CURRENT_BG ]]; then
echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
else
echo -n "%{%k%}"
fi
echo -n "%{%f%}"
CURRENT_BG=''
}
rprompt_segment() {
local bg fg fake_bg prev_bg
[[ -n $1 ]] && bg="$1" || bg='default'
[[ -n $2 ]] && fg="$2" || fg='default'
if [[ $bg == 'default' ]]; then
fake_bg=$SEGMENT_DEFAULT_BG
else
fake_bg=$bg
fi
prev_bg=$CURRENT_BG
if [[ $1 != $CURRENT_BG ]]; then
echo -n " %{%K{$prev_bg}%F{$fake_bg}%}$RSEGMENT_SEPARATOR%{%K{$bg}%F{$fg}%} "
else
echo -n "%{%K{$bg}%}%{%F{$fg}%} "
fi
CURRENT_BG=$1
[[ -n $3 ]] && print -Pn $3
}
rprompt_end() {
echo -n ' '
echo -n "%{%k%f%}"
CURRENT_BG=''
}