nixvim: add git-conflict.nvim with keymaps

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>

modules/home/nixvim/plugins/editor/default.nix

@@ -12,6 +12,7 @@
     ./conform.nix
     ./surround.nix
     ./git.nix
+    ./git-conflict.nix
     ./glance.nix
     ./flash.nix
     ./todo-comments.nix

modules/home/nixvim/plugins/editor/git-conflict.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  programs.nixvim = {
+    extraPlugins = [ pkgs.vimPlugins.git-conflict-nvim ];
+    extraConfigLua = ''
+      require("git-conflict").setup()
+    '';
+  };
+}