nixvim: add git-conflict.nvim with keymaps

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-10-06 18:44:09 +09:00 · 2026-03-11 21:12:39 +09:00
parent 34a0ac7af3
commit 4010f88c75
3 changed files with 17 additions and 0 deletions
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  programs.nixvim = {
+    extraPlugins = [ pkgs.vimPlugins.git-conflict-nvim ];
+    extraConfigLua = ''
+      require("git-conflict").setup()
+    '';
+  };
+}