init

config/plugins/git-conflict.nix

@@ -0,0 +1,24 @@
+{
+  plugins = {
+    git-conflict = {
+      enable = true;
+      settings = {
+        default_commands = true;
+        default_mappings = {
+          both = "<leader>Gb";
+          next = "<leader>Gn";
+          none = "<leader>G0";
+          ours = "<leader>Go";
+          prev = "<leader>Gp";
+          theirs = "<leader>Gt";
+        };
+        disable_diagnostics = false;
+        highlights = {
+          current = "DiffText";
+          incoming = "DiffAdd";
+        };
+        list_opener = "copen";
+      };
+    };
+  };
+}