diff --git a/home/private_dot_config/private_starship/private_config.toml b/home/private_dot_config/private_starship/private_config.toml index b0601b5..1c334da 100644 --- a/home/private_dot_config/private_starship/private_config.toml +++ b/home/private_dot_config/private_starship/private_config.toml @@ -79,8 +79,9 @@ when = "git rev-parse --git-dir 2>/dev/null && ! jj root --ignore-working-copy 2 [custom.jj] command = ''' -changeset=$(jj log --no-graph --ignore-working-copy -r @ -T 'separate(" ", bookmarks.join(", "), change_id.shortest(4), if(conflict, "x"), if(divergent, "divergent"), if(hidden, "hidden"))' 2>/dev/null) -echo " $changeset" +change_id=$(jj log --no-graph --ignore-working-copy -r @ -T 'separate(" ", bookmarks.join(", "), change_id.shortest(8), if(conflict, "x"), if(divergent, "divergent"), if(hidden, "hidden"))' 2>/dev/null) +op_id=$(jj op log --no-graph --ignore-working-copy --limit 1 -T 'id.short(8)' 2>/dev/null) +echo " $change_id  $op_id" ''' description = "Jujutsu VCS status" format = "[](bg:green fg:cyan)[[ $output ](fg:bg bg:green)]($style)[ ](fg:green)"