diffconflicts

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

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";

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=";
+			};
+		})
+	];
+}