init.lua @ 7101e316f382a47398f21ee50b03c08faa4eb568

M lua/plugin/configs/cmp.lua

@@ -4,20 +4,18 @@ function M.setup()
   local cmp = require "cmp"
 
   cmp.setup {
-    snippet = {
-      expand = function(args)
-        require("luasnip").lsp_expand(args.body)
-      end,
-    },
+    -- snippet = {
+      -- expand = function(args)
+        -- require("luasnip").lsp_expand(args.body)
+      -- end,
+    -- },
     formatting = {
       format = function(entry, vim_item)
         vim_item.menu = ({
-          nvim_lsp = "(LSP)",
-          nvim_lua = "(Lua)",
-          buffer = "(Buffer)",
-          path = "(Path)",
-          luasnip = "(Snippet)",
-          tabnine = "(Tabnine)",
+          nvim_lsp = "(L)",
+          nvim_lua = "(N)",
+          buffer = "(B)",
+          luasnip = "(S)",
         })[entry.source.name]
 
         return vim_item
@@ -55,24 +53,13 @@ end,
     },
     sources = {
       { name = "nvim_lua" },
-      { name = "nvim_lsp" },
-      { name = "buffer" },
-      { name = "tabnine" },
-      { name = "luasnip" },
-      { name = "path" },
+      { name = "nvim_lsp", max_item_count = 10 },
+      { name = "buffer", keyword_length = 5, max_item_count = 5 },
+      { name = "luasnip", max_item_count = 4 },
     },
-    -- experimental = {
-    --   native_menu = false,
-    --   ghost_text = true,
-    -- },
   }
 
-  require("nvim-autopairs.completion.cmp").setup {
-    map_cr = true,
-    map_complete = true,
-    auto_select = true,
-    insert = false,
-  }
+  require("nvim-autopairs.completion.cmp").setup {}
 end
 
 return M

M lua/plugin/init.lua

@@ -4,7 +4,7 @@ use "nvim-lua/plenary.nvim"
   use "LunarVim/onedarker.nvim"
   use "kyazdani42/nvim-web-devicons"
   use "romgrk/barbar.nvim"
-  use { "tpope/vim-surround", keys = { "c", "y", "d" } }
+  -- use { "tpope/vim-surround", keys = { "c", "y", "d" } }
 
   use {
     "numToStr/Comment.nvim",
@@ -13,13 +13,13 @@ require("Comment").setup()
     end,
   }
 
-  -- use {
-  --   "folke/trouble.nvim",
-  --   cmd = "TroubleToggle",
-  --   config = function()
-  --     require("trouble").setup {}
-  --   end,
-  -- }
+  use {
+    "folke/trouble.nvim",
+    cmd = "TroubleToggle",
+    config = function()
+      require("trouble").setup {}
+    end,
+  }
 
   use {
     "neovim/nvim-lspconfig",
@@ -56,7 +56,6 @@ --   "mfussenegger/nvim-dap",
   --   requires = {
   --     { "Pocco81/DAPInstall.nvim" },
   --     { "theHamsta/nvim-dap-virtual-text", after = "nvim-dap" },
-  --     { "jbyuki/one-small-step-for-vimkind", ft = "lua", after = "nvim-dap" },
   --   },
   --   config = function()
   --     require("plugin.configs.dap").setup()
@@ -88,22 +87,6 @@ end,
   }
 
   use {
-    "folke/lua-dev.nvim",
-    ft = "lua",
-    config = function()
-      require("lua-dev").setup {}
-    end,
-  }
-
-  use {
-    "ray-x/go.nvim",
-    ft = "go",
-    config = function()
-      require("go").setup { gofmt = "gofumpt" }
-    end,
-  }
-
-  use {
     "folke/todo-comments.nvim",
     config = function()
       require("todo-comments").setup {}
@@ -116,10 +99,7 @@ requires = {
       { "hrsh7th/cmp-nvim-lua", after = "nvim-cmp" },
       { "hrsh7th/cmp-nvim-lsp", after = "nvim-cmp" },
       { "hrsh7th/cmp-buffer", after = "nvim-cmp" },
-      { "hrsh7th/cmp-path", after = "nvim-cmp" },
-      { "saadparwaiz1/cmp_luasnip", after = "nvim-cmp" },
-      { "L3MON4D3/LuaSnip", requires = "rafamadriz/friendly-snippets", after = "nvim-cmp" },
-      { "tzachar/cmp-tabnine", run = "./install.sh", after = "nvim-cmp" },
+      { "saadparwaiz1/cmp_luasnip", requires = { "L3MON4D3/LuaSnip", "rafamadriz/friendly-snippets" }, after = "nvim-cmp" },
     },
     config = function()
       require("plugin.configs.cmp").setup()
@@ -129,9 +109,7 @@
   use {
     "max397574/better-escape.nvim",
     config = function()
-      require("better_escape").setup {
-        mapping = { "jk" },
-      }
+      require("better_escape").setup { mapping = { "jk", "jj" } }
     end,
   }
 
@@ -154,14 +132,13 @@
   use {
     "nvim-treesitter/nvim-treesitter",
     branch = "0.5-compat",
-    -- requires = {
-    --   "Smirnov-O/ts-unit.nvim",
-    --   after = "nvim-treesitter",
-    --   keys = { "cip", "vip", "yip", "dip" },
-    --   config = function()
-    --     require("ts-unit").setup { keymaps = true }
-    --   end,
-    -- },
+    requires = {
+      "Smirnov-O/ts-unit.nvim",
+      after = "nvim-treesitter",
+      config = function()
+        require("ts-unit").setup { keymaps = true }
+      end,
+    },
     config = function()
       require("plugin.configs.treesitter").setup()
     end,