restore jj/jjui alongside git

profiles/neovim/default.nix

@@ -8,6 +8,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,15 +118,21 @@
 			options.desc = "Visit paths (cwd)";
 		}
 		# g - git
+		{
+			mode = "n";
+			key = "<leader>gc";
+			action = ":JJDiffConflicts<CR>";
+			options.desc = "Resolve conflicts";
+		}
 		{
 			mode = "n";
 			key = "<leader>gg";
 			action.__raw = ''
-				function()
-				  require('toggleterm.terminal').Terminal:new({ cmd = 'lazygit', direction = 'float' }):toggle()
-				end
+						function()
+				require('toggleterm.terminal').Terminal:new({ cmd = 'jjui', direction = 'float' }):toggle()
+						end
 			'';
-			options.desc = "lazygit";
+			options.desc = "jjui";
 		}
 		# l - lsp/formatter
 		{

profiles/neovim/plugins/jj-diffconflicts.nix

@@ -0,0 +1,14 @@
+{pkgs, ...}: {
+	programs.nixvim.extraPlugins = [
+		(pkgs.vimUtils.buildVimPlugin {
+				name = "jj-diffconflicts";
+				src =
+					pkgs.fetchFromGitHub {
+						owner = "rafikdraoui";
+						repo = "jj-diffconflicts";
+						rev = "main";
+						hash = "sha256-hvMXpslucywVYA9Sdxx6IcXQXYcYNWK8s9jr+KtStdI=";
+					};
+			})
+	];
+}