init.lua @ d98fd929086bd3f413e8a4a716c577bb8eb74231

M lua/plugins/completion.lua

@@ -4,21 +4,17 @@ "hrsh7th/nvim-cmp",
   event = "InsertEnter",
   dependencies = {
     "hrsh7th/cmp-buffer",
-    "saadparwaiz1/cmp_luasnip",
     "hrsh7th/cmp-path",
-    "hrsh7th/cmp-nvim-lsp",
     { "hrsh7th/cmp-cmdline", keys = { ":" } },
     { "kirasok/cmp-hledger", ft = "ledger" },
   },
   config = function(_, opts)
     local cmp = require "cmp"
 
-    ---@diagnostic disable-next-line: missing-fields
-    cmp.setup.filetype({ "gitcommit", "NeogitCommitMessage" }, {
-      sources = { { name = "buffer" }, { name = "luasnip" } },
-    })
+    for _, setup_fn in ipairs(opts.custom_setups) do
+      setup_fn(cmp)
+    end
 
-    ---@diagnostic disable-next-line: missing-fields
     cmp.setup.cmdline(":", {
       mapping = cmp.mapping.preset.cmdline(),
       sources = { { name = "path" }, { name = "cmdline" } },
@@ -32,6 +28,17 @@
     ---@type cmp.Config
     ---@diagnostic disable-next-line: missing-fields
     return {
+      custom_setups = {
+        function(c)
+          c.setup.filetype("ledger", {
+            sources = {
+              { name = "hledger", group_index = 0 },
+              { name = "buffer", group_index = 0 },
+            },
+          })
+        end,
+      },
+
       -- snippets are set up in [luasnip.lua]
 
       ---@diagnostic disable-next-line: missing-fields
@@ -94,10 +101,9 @@ fallback()
           end
         end,
       },
-      sources = cmp.config.sources {
-        { name = "hledger", group_index = 0 },
-        { name = "buffer", group_index = 3, max_item_count = 4 },
-        { name = "path", group_index = 4, max_item_count = 2 },
+      sources = {
+        { name = "buffer", group_index = 2, max_item_count = 4 },
+        { name = "path", group_index = 2, max_item_count = 2 },
       },
     }
   end,

M lua/plugins/copilot.lua

@@ -68,7 +68,7 @@ ---@param opts cmp.ConfigSchema
     opts = function(_, opts)
       table.insert(opts.sources, 1, {
         name = "copilot",
-        group_index = 2,
+        group_index = 0,
         max_item_count = 3,
       })
     end,

M lua/plugins/git.lua

@@ -72,4 +72,17 @@ },
       },
     },
   },
+
+  {
+    "nvim-cmp",
+    ---@module "cmp"
+    ---@param opts cmp.ConfigSchema
+    opts = function(_, opts)
+      table.insert(opts.custom_setups, function(cmp)
+        cmp.setup.filetype({ "gitcommit", "NeogitCommitMessage" }, {
+          sources = { { name = "buffer" }, { name = "luasnip" } },
+        })
+      end)
+    end,
+  },
 }

M lua/plugins/lsp/init.lua

@@ -20,12 +20,13 @@ },
     },
     {
       "nvim-cmp",
+      dependencies = { "hrsh7th/cmp-nvim-lsp" },
       ---@module "cmp"
       ---@param opts cmp.ConfigSchema
       opts = function(_, opts)
-        table.insert(opts.sources, {
+        table.insert(opts.sources, 1, {
           name = "nvim_lsp",
-          group_index = 1,
+          group_index = 0,
           max_item_count = 12,
         })
       end,

M lua/plugins/luasnip.lua

@@ -5,6 +5,7 @@ dependencies = {
     "rafamadriz/friendly-snippets",
     {
       "nvim-cmp",
+      dependencies = { "saadparwaiz1/cmp_luasnip" },
       ---@module "cmp"
       ---@param opts cmp.ConfigSchema
       opts = function(_, opts)
@@ -13,9 +14,9 @@ expand = function(args)
             require("luasnip").lsp_expand(args.body)
           end,
         }
-        table.insert(opts.sources, {
+        table.insert(opts.sources, 1, {
           name = "luasnip",
-          group_index = 2,
+          group_index = 1,
           max_item_count = 3,
         })
       end,

M lua/plugins/orgmode.lua

@@ -47,6 +47,9 @@ table.insert(opts.sources, {
           name = "orgmode",
           group_index = 0,
         })
+        table.insert(opts.custom_setups, function(cmp)
+          cmp.setup.filetype("org-roam-select", { sources = {} })
+        end)
       end,
     },
   },