von/vdotfiles
1
0
Fork 0
Code Activity

some experiments

Browse source
This commit is contained in:
Von Random 2022-12-21 17:59:58 +02:00
parent 235c626ff9
commit a5827a87a2
5 changed files with 32 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
zsh/functions.zsh
View file

@ -3,6 +3,7 @@ termcompat() {
case $term in
(alacritty*) ;&
(kitty*) ;&
(wezterm) ;&
(xterm-*)
term=xterm;;
(rxvt-unicode*)

20
zsh/prompt-plain.zsh
View file

@ -1,10 +1,10 @@
reset='%%{\e[0m%%}'
prompt_fmt='[ %s %s:%s %s]\n\U01f525 '
prompt_fmt='[ %s@%s %s %s]\n\U1f525 '
prompt_fmtn='[ %%{\e[2;3m%%}%s%%{\e[0m%%} ] '
prompt_user='%F{%(!.red.blue)}%n%f'
prompt_user='%F{%(!.9.12)}%n%f'
prompt_host='%m'
prompt_cwd='%F{green}%d%f'
prompt_git_fmt='\ue0a0 %s %s%%f '
prompt_cwd='%F{10}%d%f'
prompt_git_fmt='\ue0a0 %s:%s%%f '
prompt_state_file=/tmp/zsh_gitstatus_$$.tmp
printf -v PROMPT $prompt_fmt $prompt_user $prompt_host $prompt_cwd
@ -31,15 +31,15 @@ precmd.git() {
fi
[[ $line[1,2] == '??' ]] && (( untracked_count++ ))
[[ $line[1,2] =~ .[MD] ]] && (( unstaged_count++ ))
[[ $line[1,2] =~ [MDARC]. ]] && (( staged_count++ ))
[[ $line[1,2] =~ [ADU]{2} ]] && (( unmerged_count++ ))
[[ $line[1,2] =~ [MDARC]. ]] && (( staged_count++ ))
done <<< $raw_status
(( unstaged_count )) && git_status+=%F{yellow}~$unstaged_count
(( staged_count )) && git_status+=%F{blue}+$staged_count
(( untracked_count )) && git_status+=%F{red}-$untracked_count
(( unmerged_count )) && git_status+=%F{cyan}*$unmerged_count
[[ -z $git_status ]] && git_status=%F{green}ok
(( untracked_count )) && git_status+=\ %F{9}-$untracked_count
(( unstaged_count )) && git_status+=\ %F{11}~$unstaged_count
(( unmerged_count )) && git_status+=\ %F{14}*$unmerged_count
(( staged_count )) && git_status+=\ %F{12}+$staged_count
[[ -z $git_status ]] && git_status=\ %F{10}ok
printf $prompt_git_fmt $branch_status $git_status > $prompt_state_file
}

10
zsh/prompt-powerline.zsh
View file

@ -5,17 +5,17 @@ printf -v PROMPT4 $prompt_fmtn '+%N:%i'
prompt_fifo=~/.zsh_gitstatus_$$
typeset -A prompt_symbols=(
sep_a $'\ue0b0'
sep_b $'\ue0b1'
sep_a '' #$'\ue0b0'
sep_b '' #$'\ue0b1'
ellipsis $'\u2026'
ro $'\u2717'
ssh $'\u23fb'
git $'\ue0a0'
git_unstaged '±'
git_unstaged '~'
git_staged $'\u2713'
git_untracked '!'
git_unmerged '*'
bang $'\n\U01f525'
bang $'\n\U1f525'
)
# gruvbox
typeset -A prompt_colors=(
@ -130,7 +130,7 @@ precmd.prompt.git() {
esac
done <<< $raw_status
for i in git_unstaged git_untracked git_unmerged git_staged; do
for i in git_untracked git_unmerged git_unstaged git_staged; do
(( count[$i] )) && precmd.prompt.add "$count[$i]$prompt_symbols[$i]" $prompt_colors[$i]
done
}