Fix jj/vcs status in p10k
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
# Dotfiles
|
# Install
|
||||||
|
|
||||||
## Install
|
## Common dependencies
|
||||||
|
|
||||||
### Arch
|
### Arch
|
||||||
```sh
|
```sh
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
|
|
||||||
/home/chun/dotfiles/.jj/repo
|
|
||||||
@@ -4,7 +4,7 @@ include current-theme.conf
|
|||||||
# END_KITTY_THEME
|
# END_KITTY_THEME
|
||||||
|
|
||||||
# Font
|
# Font
|
||||||
font_family JetBrains Mono Light
|
font_family JetBrainsMono NF Light
|
||||||
font_size 11.0
|
font_size 11.0
|
||||||
|
|
||||||
# Cursor
|
# Cursor
|
||||||
|
|||||||
@@ -33,7 +33,8 @@
|
|||||||
typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
|
typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
|
||||||
# os_icon # os identifier
|
# os_icon # os identifier
|
||||||
dir # current directory
|
dir # current directory
|
||||||
jj # jujutsu status
|
jj # jujutsu status (hides vcs in jj repos)
|
||||||
|
vcs # git status (shown in non-jj repos only)
|
||||||
# prompt_char # prompt symbol
|
# prompt_char # prompt symbol
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1766,11 +1767,19 @@
|
|||||||
|
|
||||||
# Jujutsu (jj) prompt segment
|
# Jujutsu (jj) prompt segment
|
||||||
function prompt_jj() {
|
function prompt_jj() {
|
||||||
# Only show in jj repos
|
|
||||||
local jj_root
|
local jj_root
|
||||||
jj_root=$(jj root 2>/dev/null) || return
|
jj_root=$(jj root 2>/dev/null)
|
||||||
|
|
||||||
# Get current change info: change_id (short), bookmarks, description, conflict/divergent flags
|
if [[ -z $jj_root ]]; then
|
||||||
|
# Not a jj repo — let vcs segment handle git display
|
||||||
|
p10k display '*/vcs=show'
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
# In a jj repo — hide vcs (would show unhelpful "detached HEAD" for jj-backed-git)
|
||||||
|
p10k display '*/vcs=hide'
|
||||||
|
|
||||||
|
# Get current change info: change_id (short), bookmarks, conflict/divergent/empty flags
|
||||||
local info
|
local info
|
||||||
info=$(jj log -r @ --no-graph -T '
|
info=$(jj log -r @ --no-graph -T '
|
||||||
separate(" ",
|
separate(" ",
|
||||||
|
|||||||
Reference in New Issue
Block a user