From 1605483e501cf7fdd97638d9c93b0080a257b68a Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 6 Mar 2026 18:56:57 +0100 Subject: [PATCH] Configure jj status and log keybinds --- nvim/lua/jj-snacks.lua | 1 + nvim/lua/plugins/git.lua | 3 ++- nvim/lua/plugins/snacks.lua | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nvim/lua/jj-snacks.lua b/nvim/lua/jj-snacks.lua index 65d9ed4..c4b3432 100644 --- a/nvim/lua/jj-snacks.lua +++ b/nvim/lua/jj-snacks.lua @@ -109,6 +109,7 @@ Snacks.picker.jj_log = function() end, confirm = function(picker, item) picker:close() + Snacks.picker.jj_show(item.change_id) end, sort = { fields = { 'score:desc', 'idx' } }, }) diff --git a/nvim/lua/plugins/git.lua b/nvim/lua/plugins/git.lua index 60124e8..f5f8d4b 100644 --- a/nvim/lua/plugins/git.lua +++ b/nvim/lua/plugins/git.lua @@ -94,9 +94,10 @@ return { local cmd = require("jj.cmd") vim.keymap.set("n", "jd", cmd.describe, { desc = "JJ describe" }) vim.keymap.set("n", "jc", cmd.commit, { desc = "JJ commit" }) + vim.keymap.set("n", "jjl", cmd.log, { desc = "jj log " }) vim.keymap.set("n", "jL", function() cmd.log({ revisions = "'all()'" }) - end, { desc = "JJ log all" }) + end, { desc = "jj log all" }) vim.keymap.set("n", "je", cmd.edit, { desc = "JJ edit" }) vim.keymap.set("n", "jn", cmd.new, { desc = "JJ new" }) vim.keymap.set("n", "jsq", cmd.squash, { desc = "JJ squash" }) diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index 9e732c4..92627ad 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -283,6 +283,7 @@ return { vim.keymap.set("n", "jl", Snacks.picker.jj_log, { desc = "jj log" }) + vim.keymap.set("n", "js", Snacks.picker.jj_show, { desc = "jj status" }) end, }, }