From f896135f36c6045a8707b15f5b1aebe50c4bfbc9 Mon Sep 17 00:00:00 2001
From: Christoph Schmatzler <christoph@schmatzler.com>
Date: Tue, 10 Mar 2026 14:09:03 +0000
Subject: [PATCH] use jj properly

---
 modules/_neovim/mappings.nix | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/modules/_neovim/mappings.nix b/modules/_neovim/mappings.nix
index 8aadae0..540cbb9 100644
--- a/modules/_neovim/mappings.nix
+++ b/modules/_neovim/mappings.nix
@@ -143,8 +143,12 @@
 		{
 			mode = "n";
 			key = "<leader>vD";
-			action = ":DiffviewOpen<CR>";
-			options.desc = "Diffview (all changes)";
+			action.__raw = ''
+				function()
+					require('jj.diff').show_revision({})
+				end
+			'';
+			options.desc = "Diff (all changes)";
 		}
 		{
 			mode = "n";
@@ -175,14 +179,12 @@
 		{
 			mode = "n";
 			key = "<leader>vh";
-			action = ":DiffviewFileHistory %<CR>";
-			options.desc = "File history";
-		}
-		{
-			mode = "n";
-			key = "<leader>vH";
-			action = ":DiffviewFileHistory<CR>";
-			options.desc = "Branch history";
+			action.__raw = ''
+				function()
+					require('jj.diff').show_revision({ rev = '@-' })
+				end
+			'';
+			options.desc = "Diff parent revision";
 		}
 		{
 			mode = "n";
@@ -219,8 +221,12 @@
 		{
 			mode = "n";
 			key = "<leader>vR";
-			action = ":DiffviewOpen origin/main...HEAD --imply-local<CR>";
-			options.desc = "Review bookmark";
+			action.__raw = ''
+				function()
+					require('jj.diff').diff_revisions({ left = 'trunk()', right = '@' })
+				end
+			'';
+			options.desc = "Review bookmark (trunk..@)";
 		}
 		{
 			mode = "n";