Add neovim git conflict plugin

rsc/config/nvim/plugins.lua

@@ -1,6 +1,7 @@
 local cmp = require "cmp"
 
 local plugins = {
+  {'akinsho/git-conflict.nvim', version = "*", config = true, lazy = false,},
   {
     'numToStr/Comment.nvim',
     lazy = false,
@@ -43,19 +44,19 @@ local plugins = {
       require("nvim-dap-virtual-text").setup()
     end
   },
-  {
-    "hrsh7th/nvim-cmp",
-    opts = function()
-      local M = require "plugins.configs.cmp"
-      M.completion.completeopt = "menu,menuone,noselect"
-      M.mapping["<CR>"] = cmp.mapping.confirm {
-        behavior = cmp.ConfirmBehavior.Insert,
-        select = false,
-      }
-      table.insert(M.sources, {name = "crates"})
-      return M
-    end,
-  },
+  -- {
+  --   "hrsh7th/nvim-cmp",
+  --   opts = function()
+  --     local M = require "plugins.configs.cmp"
+  --     M.completion.completeopt = "menu,menuone,noselect"
+  --     M.mapping["<CR>"] = cmp.mapping.confirm {
+  --       behavior = cmp.ConfirmBehavior.Insert,
+  --       select = false,
+  --     }
+  --     table.insert(M.sources, {name = "crates"})
+  --     return M
+  --   end,
+  -- },
   {
     "m4xshen/hardtime.nvim",
     dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" },