git and noswapfile

lua/plugins/git.lua

@@ -30,4 +30,6 @@ return {
       },
     },
   },
+
+  { "akinsho/git-conflict.nvim", event = "VeryLazy", config = true },
 }

lua/plugins/telescope.lua

@@ -2,10 +2,11 @@ return {
 
   {
     "nvim-telescope/telescope.nvim",
-    dependencies = { "nvim-treesitter/nvim-treesitter" },
+    dependencies = { "nvim-treesitter/nvim-treesitter", "cljoly/telescope-repo.nvim" },
     cmd = "Telescope",
-    opts = function()
-      return require "configs.telescope"
+    config = function()
+      require("telescope").setup(require "configs.telescope")
+      require("telescope").load_extension "repo"
     end,
     keys = {
       {
@@ -36,6 +37,12 @@ return {
         end,
         desc = "Buffers",
       },
+      {
+        "<leader>p",
+        function()
+          require("telescope").extensions.repo.list {}
+        end,
+      },
     },
   },
 }