init.lua @ 1fd6299

M lazy-lock.json

@@ -19,7 +19,6 @@ "image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" },
   "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
   "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
   "markview.nvim": { "branch": "dev", "commit": "c76411a2a5422b29ca935b6c212c27e785da2020" },
   "mini.ai": { "branch": "main", "commit": "640418aafb5a6e830eade483cdc2d4f0cd0e3f1a" },
   "mini.bufremove": { "branch": "main", "commit": "bba1d8b413d37081756f59200b8cf756181e5b9a" },

M lua/plugins/completion.lua

@@ -33,11 +33,7 @@
     ---@type cmp.Config
     ---@diagnostic disable-next-line: missing-fields
     return {
-      snippet = {
-        expand = function(args)
-          require("luasnip").lsp_expand(args.body)
-        end,
-      },
+      --- snippets are set up in [luasnip.lua]
       window = {},
       ---@diagnostic disable-next-line: missing-fields
       view = { entries = { follow_cursor = true } },
@@ -101,10 +97,8 @@ end,
       },
       sources = cmp.config.sources {
         { name = "hledger", group_index = 0 },
-        { name = "nvim_lsp", max_item_count = 12 },
-        { name = "buffer", max_item_count = 4 },
-        { name = "luasnip", max_item_count = 3 },
-        { name = "path", max_item_count = 2 },
+        { name = "buffer", group_index = 3, max_item_count = 4 },
+        { name = "path", group_index = 4, max_item_count = 2 },
       },
     }
   end,

M lua/plugins/copilot.lua

@@ -2,7 +2,6 @@ local enabled = true
 
 ---@type LazySpec
 return {
-  enabled = enabled,
   {
     "zbirenbaum/copilot.lua",
     enabled = enabled,

M lua/plugins/lsp/init.lua

@@ -4,6 +4,8 @@ "neovim/nvim-lspconfig",
   event = "BufRead",
   dependencies = {
     "b0o/schemastore.nvim",
+    { import = "plugins.lsp.lazydev" },
+    { import = "plugins.lsp.null-ls" },
     {
       "j-hui/fidget.nvim",
       dependencies = { "nvim-lspconfig" },
@@ -16,8 +18,17 @@ },
         },
       },
     },
-    { import = "plugins.lsp.lazydev" },
-    { import = "plugins.lsp.null-ls" },
+    {
+      "nvim-cmp",
+      ---@param opts cmp.ConfigSchema
+      opts = function(_, opts)
+        table.insert(opts.sources, {
+          name = "nvim_lsp",
+          group_index = 1,
+          max_item_count = 12,
+        })
+      end,
+    },
     {
       "RRethy/vim-illuminate",
       dependencies = { "nvim-lspconfig" },

M lua/plugins/lsp/lazydev.lua

@@ -7,6 +7,7 @@ dependencies = {
     "nvim-lspconfig",
     {
       "nvim-cmp",
+      ---@param opts cmp.ConfigSchema
       opts = function(_, opts)
         table.insert(opts.sources, 1, {
           name = "lazydev",

M lua/plugins/luasnip.lua

@@ -1,7 +1,25 @@
 ---@type LazySpec
 return {
   "L3MON4D3/LuaSnip",
-  dependencies = { "rafamadriz/friendly-snippets" },
+  dependencies = {
+    "rafamadriz/friendly-snippets",
+    {
+      "nvim-cmp",
+      ---@param opts cmp.ConfigSchema
+      opts = function(_, opts)
+        opts.snippet = {
+          expand = function(args)
+            require("luasnip").lsp_expand(args.body)
+          end,
+        }
+        table.insert(opts.sources, {
+          name = "luasnip",
+          group_index = 2,
+          max_item_count = 3,
+        })
+      end,
+    },
+  },
   build = "make install_jsregexp",
   keys = {
     {

M lua/plugins/orgmode.lua

@@ -40,8 +40,12 @@ dependencies = {
     { "akinsho/org-bullets.nvim", config = true },
     {
       "nvim-cmp",
+      ---@param opts cmp.ConfigSchema
       opts = function(_, opts)
-        table.insert(opts.sources, 1, { name = "orgmode" })
+        table.insert(opts.sources, {
+          name = "orgmode",
+          group_index = 0,
+        })
       end,
     },
   },