diff --git a/src/overlays/vim.nix b/src/overlays/vim.nix
new file mode 100644
index 0000000..ba39a4d
--- /dev/null
+++ b/src/overlays/vim.nix
@@ -0,0 +1,13 @@
+final: prev:  {
+  vimPlugins = prev.lib.recursiveUpdate prev.vimPlugins {
+    git-conflict-nvim = final.vimUtils.buildVimPlugin {
+      name = "git-conflict-nvim";
+      src = final.fetchFromGitHub {
+        owner = "akinsho";
+        repo = "git-conflict.nvim";
+        rev = "80bc8931d4ed8c8c4d289a08e1838fcf4741408d";
+        hash = "sha256-tBKGjzKK/SftivTgdujk4NaIxz8sUNyd9ULlGKAL8x8=";
+      };
+    };
+  };
+}