diff --git a/README.md b/README.md index f56ee83..7a66782 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Dotfiles +# Install -## Install +## Common dependencies ### Arch ```sh diff --git a/jj/.config/jj/repos/4a1e9c69ec37511440a3/metadata.binpb b/jj/.config/jj/repos/4a1e9c69ec37511440a3/metadata.binpb deleted file mode 100644 index 6c8b2b6..0000000 --- a/jj/.config/jj/repos/4a1e9c69ec37511440a3/metadata.binpb +++ /dev/null @@ -1,2 +0,0 @@ - -/home/chun/dotfiles/.jj/repo \ No newline at end of file diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index 236830c..24b283f 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -4,7 +4,7 @@ include current-theme.conf # END_KITTY_THEME # Font -font_family JetBrains Mono Light +font_family JetBrainsMono NF Light font_size 11.0 # Cursor diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh index a02eee3..e86189c 100644 --- a/zsh/.p10k.zsh +++ b/zsh/.p10k.zsh @@ -33,7 +33,8 @@ typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( # os_icon # os identifier 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 ) @@ -1766,11 +1767,19 @@ # Jujutsu (jj) prompt segment function prompt_jj() { - # Only show in jj repos 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 info=$(jj log -r @ --no-graph -T ' separate(" ",