From 6bbc3735f368dcbc4d234bcaa7402836de78febb Mon Sep 17 00:00:00 2001 From: "kacaii.dev" Date: Sat, 3 Oct 2026 13:03:15 -0300 Subject: [PATCH] fish/jj: change jj prompt --- .config/fish/functions/_fish_jj_prompt.fish | 18 +++--------------- .config/nvim/nvim-pack-lock.json | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.config/fish/functions/_fish_jj_prompt.fish b/.config/fish/functions/_fish_jj_prompt.fish index 209c353..45d505f 100644 --- a/.config/fish/functions/_fish_jj_prompt.fish +++ b/.config/fish/functions/_fish_jj_prompt.fish @@ -2,27 +2,15 @@ function _fish_jj_prompt command -sq jj; or return 1 set -l info "$( - jj log 2>/dev/null --no-graph --ignore-working-copy --color=always \ - --revisions @ --template ' + jj log 2>/dev/null --no-graph --ignore-working-copy --no-pager \ + --color=always -r @ --template ' separate(" ", if(conflict, label("conflict", "conflict")), if(divergent, label("divergent", "divergent")), if(parents.len() > 1, label("merge", "merged")), change_id.shortest(6), - commit_id.shortest(6), if(bookmarks, "[" ++ bookmarks ++ "]"), - coalesce( - surround( - "\"", - "\"", - if( - description.first_line().substr(0, 24).starts_with(description.first_line()), - description.first_line().substr(0, 24), - description.first_line().substr(0, 23) ++ "…" - ) - ), - "(no description set)" - ), + description.first_line(), if(empty, "(empty)"), if(conflict, label("conflict", "conflict")), )' diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index 7396bf1..c0dbd8a 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -94,7 +94,7 @@ "src": "https://github.com/neovim/nvim-lspconfig" }, "nvim-treesitter": { - "rev": "910fdf6f49e9dee7e7257c7d11a76b040fdfb9de", + "rev": "e289100ff98969e118c702199d88b764ce9e7fdf", "src": "https://github.com/nvim-treesitter/nvim-treesitter" }, "quicker.nvim": { -- 2.51.2