From 4a8f67f086bbf26984d8be1d4eb9111dbe402389 Mon Sep 17 00:00:00 2001
From: Oscar Wallberg <oscar.wallberg@outlook.com>
Date: Tue, 29 Apr 2025 10:31:47 +0200
Subject: [PATCH] fix: move lspkind into nvim-cmp config

---
 lua/ow/plugins/cmp.lua     | 29 +++++++++++++++++------------
 lua/ow/plugins/lspkind.lua | 12 ------------
 2 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 lua/ow/plugins/lspkind.lua

diff --git a/lua/ow/plugins/cmp.lua b/lua/ow/plugins/cmp.lua
index e7ff359..79b4aef 100644
--- a/lua/ow/plugins/cmp.lua
+++ b/lua/ow/plugins/cmp.lua
@@ -45,12 +45,18 @@ return {
             version = "2.*",
             dependencies = { "rafamadriz/friendly-snippets" },
         },
+        {
+            "onsails/lspkind.nvim",
+            config = function()
+                require("lspkind").init()
+            end,
+        },
     },
     config = function()
         local cmp = require("cmp")
         local luasnip = require("luasnip")
         local utils = require("ow.utils")
-        local lspkind = utils.try_require("lspkind")
+        local lspkind = require("lspkind")
 
         ---@type cmp.ConfigSchema
         local opts = {
@@ -67,19 +73,18 @@ return {
                     luasnip.lsp_expand(args.body)
                 end,
             },
+            ---@diagnostic disable-next-line: missing-fields
             formatting = {
                 format = function(entry, vim_item)
-                    if lspkind then
-                        vim_item = lspkind.cmp_format({
-                            mode = "symbol",
-                            maxwidth = 50,
-                            ellipsis_char = "...",
-                            before = function(_, item)
-                                item.dup = 0 -- remove duplicates, see nvim-cmp #511
-                                return item
-                            end,
-                        })(entry, vim_item)
-                    end
+                    vim_item = lspkind.cmp_format({
+                        mode = "symbol",
+                        maxwidth = 50,
+                        ellipsis_char = "...",
+                        before = function(_, item)
+                            item.dup = 0 -- remove duplicates, see nvim-cmp #511
+                            return item
+                        end,
+                    })(entry, vim_item)
 
                     return vim_item
                 end,
diff --git a/lua/ow/plugins/lspkind.lua b/lua/ow/plugins/lspkind.lua
deleted file mode 100644
index 8ea0f39..0000000
--- a/lua/ow/plugins/lspkind.lua
+++ /dev/null
@@ -1,12 +0,0 @@
--- https://github.com/onsails/lspkind.nvim
-
----@type LazyPluginSpec
-return {
-    "onsails/lspkind.nvim",
-    config = function()
-        local ok, _ = pcall(require, "nvim-cmp")
-        if not ok then
-            require("lspkind").init()
-        end
-    end,
-}