fix(extras.ai): blink.cmp integration and menu drawing

lua/lazyvim/plugins/extras/ai/codeium.lua

@@ -55,17 +55,32 @@ return {
     end,
   },
 
-  {
+  vim.g.ai_cmp and {
     "saghen/blink.cmp",
     optional = true,
+    dependencies = { "codeium.nvim", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = vim.g.ai_cmp and { "codeium" } or nil,
+        compat = { "codeium" },
+      },
+      completion = {
+        menu = {
+          draw = {
+            components = {
+              kind = {
+                text = function(ctx)
+                  return ctx.source_name == "codeium" and "Codeium" or ctx.kind
+                end,
+                highlight = function(ctx)
+                  return ctx.source_name == "codeium" and "BlinkCmpKindCodeium"
+                    or require("blink.cmp.completion.windows.render.tailwind").get_hl(ctx)
+                    or ("BlinkCmpKind" .. ctx.kind)
+                end,
+              },
+            },
+          },
+        },
       },
     },
-    dependencies = {
+  } or nil,
-      "codeium.nvim",
-      vim.g.ai_cmp and "saghen/blink.compat" or nil,
-    },
-  },
 }

lua/lazyvim/plugins/extras/ai/copilot.lua

@@ -94,31 +94,37 @@ return {
     },
   },
 
-  -- blink.cmp
+  vim.g.ai_cmp and {
-  {
     "saghen/blink.cmp",
     optional = true,
-    dependencies = {
+    dependencies = { "giuxtaposition/blink-cmp-copilot" },
-      {
+    opts = {
-        "giuxtaposition/blink-cmp-copilot",
+      sources = {
-        enabled = vim.g.ai_cmp, -- only enable if needed
+        completion = {
-        specs = {
+          enabled_providers = { "copilot" },
-          {
+        },
-            "blink.cmp",
+        providers = {
-            optional = true,
+          copilot = { name = "copilot", module = "blink-cmp-copilot" },
-            opts = {
+        },
-              sources = {
+      },
-                providers = {
+      completion = {
-                  copilot = { name = "copilot", module = "blink-cmp-copilot" },
+        menu = {
-                },
+          draw = {
-                completion = {
+            components = {
-                  enabled_providers = { "copilot" },
+              kind = {
-                },
+                text = function(ctx)
+                  return ctx.source_name == "copilot" and "Copilot" or ctx.kind
+                end,
+                highlight = function(ctx)
+                  return ctx.source_name == "copilot" and "BlinkCmpKindCopilot"
+                    or require("blink.cmp.completion.windows.render.tailwind").get_hl(ctx)
+                    or ("BlinkCmpKind" .. ctx.kind)
+                end,
               },
             },
           },
         },
       },
     },
-  },
+  } or nil,
 }

lua/lazyvim/plugins/extras/ai/supermaven.lua

@@ -43,22 +43,34 @@ return {
     end,
   },
 
-  -- blink.cmp integration
+  vim.g.ai_cmp and {
-  {
     "saghen/blink.cmp",
     optional = true,
-    ---@module 'blink.cmp'
+    dependencies = { "supermaven-nvim", "saghen/blink.compat" },
-    ---@type blink.cmp.Config
     opts = {
       sources = {
-        compat = vim.g.ai_cmp and { "supermaven" } or nil,
+        compat = { "supermaven" },
+      },
+      completion = {
+        menu = {
+          draw = {
+            components = {
+              kind = {
+                text = function(ctx)
+                  return ctx.source_name == "supermaven" and "Supermaven" or ctx.kind
+                end,
+                highlight = function(ctx)
+                  return ctx.source_name == "supermaven" and "BlinkCmpKindSupermaven"
+                    or require("blink.cmp.completion.windows.render.tailwind").get_hl(ctx)
+                    or ("BlinkCmpKind" .. ctx.kind)
+                end,
+              },
+            },
+          },
+        },
       },
     },
-    dependencies = {
+  } or nil,
-      "supermaven-nvim",
-      vim.g.ai_cmp and "saghen/blink.compat" or nil,
-    },
-  },
 
   {
     "nvim-lualine/lualine.nvim",

lua/lazyvim/plugins/extras/coding/blink.lua

@@ -52,7 +52,7 @@ return {
           auto_show_delay_ms = 200,
         },
         ghost_text = {
-          enabled = vim.g.ai_cmp,
+          enabled = true,
         },
       },