commit c0a52453862fdb2bf68098b4ab93c99c9997d50e
author Skyler Grey <skyler3665@gmail.com> Sat Jul 09 21:06:53 2022 +0100
committer Skyler Grey <skyler3665@gmail.com> Sat Jul 09 21:06:53 2022 +0100
tree 2d4a1cd1a2055e6d67fa8e52f35ec7bd202ba0ac
parent 8d2f105d28d2c236f0532464c335185a76454c29

Enable git-conflict

src/apps/personal/vim.nix

diff --git a/src/apps/personal/vim.nix b/src/apps/personal/vim.nix
index 16481de..f97c31e 100644
--- a/src/apps/personal/vim.nix
+++ b/src/apps/personal/vim.nix
@@ -71,6 +71,8 @@
             enable = true,
           },
         }
+
+        require('git-conflict').setup()
       EOF
     '';