Merge remote-tracking branch 'origin/rolling'

1 files changed, 24 insertions, 36 deletions

diff --git a/lua/plugins.lua b/lua/plugins.lua
index 0b71d48a..65eb16a8 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -6,12 +6,7 @@ return {
   { "jose-elias-alvarez/null-ls.nvim" },
   { "antoinemadec/FixCursorHold.nvim" }, -- Needed while issue https://github.com/neovim/neovim/issues/12587 is still open
   {
-    "kabouzeid/nvim-lspinstall",
-    event = "VimEnter",
-    config = function()
-      local lspinstall = require "core.lspinstall"
-      lspinstall.setup()
-    end,
+    "williamboman/nvim-lsp-installer",
   },
 
   { "nvim-lua/popup.nvim" },
@@ -24,49 +19,42 @@ return {
     end,
     disable = not lvim.builtin.telescope.active,
   },
-
-  -- Completion & Snippets
+  -- Install nvim-cmp, and buffer source as a dependency
   {
-    "hrsh7th/nvim-compe",
-    event = "InsertEnter",
+    "hrsh7th/nvim-cmp",
     config = function()
-      require("core.compe").setup()
+      require("core.cmp").setup()
+    end,
+    requires = {
+      "L3MON4D3/LuaSnip",
+      "saadparwaiz1/cmp_luasnip",
+      "hrsh7th/cmp-buffer",
+      "hrsh7th/cmp-nvim-lsp",
+      "hrsh7th/cmp-path",
+      "hrsh7th/cmp-nvim-lua",
+    },
+    run = function()
+      -- cmp's config requires cmp to be installed to run the first time
+      if not lvim.builtin.cmp then
+        require("core.cmp").config()
+      end
     end,
-    disable = not lvim.builtin.compe.active,
-    -- wants = "vim-vsnip",
-    -- requires = {
-    -- {
-    --   "hrsh7th/vim-vsnip",
-    --   wants = "friendly-snippets",
-    --   event = "InsertCharPre",
-    -- },
-    -- {
-    --   "rafamadriz/friendly-snippets",
-    --   event = "InsertCharPre",
-    -- },
-    -- },
-  },
-  {
-    "hrsh7th/vim-vsnip",
-    -- wants = "friendly-snippets",
-    event = "InsertEnter",
-    disable = not lvim.builtin.compe.active,
   },
   {
     "rafamadriz/friendly-snippets",
-    event = "InsertCharPre",
-    disable = not lvim.builtin.compe.active,
+    -- event = "InsertCharPre",
+    -- disable = not lvim.builtin.compe.active,
   },
 
   -- Autopairs
   {
     "windwp/nvim-autopairs",
     -- event = "InsertEnter",
-    after = "nvim-compe",
+    after = "nvim-cmp",
     config = function()
       require("core.autopairs").setup()
     end,
-    disable = not lvim.builtin.autopairs.active or not lvim.builtin.compe.active,
+    disable = not lvim.builtin.autopairs.active,
   },
 
   -- Treesitter
@@ -116,7 +104,7 @@ return {
     "terrortylor/nvim-comment",
     event = "BufRead",
     config = function()
-      require("nvim_comment").setup()
+      require("core.comment").setup()
     end,
     disable = not lvim.builtin.comment.active,
   },
@@ -183,7 +171,7 @@ return {
 
   -- Terminal
   {
-    "akinsho/nvim-toggleterm.lua",
+    "akinsho/toggleterm.nvim",
     event = "BufWinEnter",
     config = function()
       require("core.terminal").setup()