From cb6a6f9f465d3c4dd11d9b786b42320dc544faba Mon Sep 17 00:00:00 2001
From: Christoph Schmatzler <christoph@schmatzler.com>
Date: Mon, 15 Dec 2025 22:05:23 +0000
Subject: [PATCH] diffconflicts

---
 profiles/neovim/default.nix                  |  1 +
 profiles/neovim/mappings.nix                 |  6 ++++++
 profiles/neovim/plugins/jj-diffconflicts.nix | 13 +++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 profiles/neovim/plugins/jj-diffconflicts.nix

diff --git a/profiles/neovim/default.nix b/profiles/neovim/default.nix
index c69595d..74c6245 100644
--- a/profiles/neovim/default.nix
+++ b/profiles/neovim/default.nix
@@ -9,6 +9,7 @@
 		./plugins/grug-far.nix
 		./plugins/harpoon.nix
 		./plugins/hunk.nix
+		./plugins/jj-diffconflicts.nix
 		./plugins/lsp.nix
 		./plugins/mini.nix
 		./plugins/oil.nix
diff --git a/profiles/neovim/mappings.nix b/profiles/neovim/mappings.nix
index a9fca74..13c84ee 100644
--- a/profiles/neovim/mappings.nix
+++ b/profiles/neovim/mappings.nix
@@ -118,6 +118,12 @@
 			options.desc = "Visit paths (cwd)";
 		}
 		# g - git
+		{
+			mode = "n";
+			key = "<leader>gc";
+			action = ":JJDiffConflicts<CR>";
+			options.desc = "Resolve conflicts";
+		}
 		{
 			mode = "n";
 			key = "<leader>gg";
diff --git a/profiles/neovim/plugins/jj-diffconflicts.nix b/profiles/neovim/plugins/jj-diffconflicts.nix
new file mode 100644
index 0000000..688eba8
--- /dev/null
+++ b/profiles/neovim/plugins/jj-diffconflicts.nix
@@ -0,0 +1,13 @@
+{pkgs, ...}: {
+	programs.nixvim.extraPlugins = [
+		(pkgs.vimUtils.buildVimPlugin {
+			name = "jj-diffconflicts";
+			src = pkgs.fetchFromGitHub {
+				owner = "rafikdraoui";
+				repo = "jj-diffconflicts";
+				rev = "main";
+				hash = "sha256-FXsLSYy+eli8VArUL8ZOiPtyOk4Q8TUYwobEefZPRII=";
+			};
+		})
+	];
+}