feat: Update cmp colors

home/editors/nvim/colorschemes.nix

@@ -7,6 +7,7 @@
       settings = {
         flavour = "mocha";
         transparent_background = true;
+        show_end_of_buffer = true;
         integrations = {
           cmp = true;
           gitsigns = true;
@@ -25,7 +26,50 @@
           copilot_vim = true;
           lsp_trouble = true;
           which_key = true;
+          neotest = true;
+          dap = true;
         };
+        custom_highlights =
+          # lua
+          ''
+            function(colors)
+              return {
+                Pmenu = { bg = colors.mantle, fg = colors.text },
+                PmenuSel = { bg = colors.surface1, fg = "NONE", style = { "bold" } },
+
+                CmpItemKindFunction = { bg = colors.blue, fg = colors.crust },
+                CmpItemKindMethod = { bg = colors.blue, fg = colors.crust },
+                CmpItemKindConstructor = { bg = colors.blue, fg = colors.crust },
+
+                CmpItemKindClass = { bg = colors.yellow, fg = colors.crust },
+                CmpItemKindInterface = { bg = colors.yellow, fg = colors.crust },
+                CmpItemKindStruct = { bg = colors.yellow, fg = colors.crust },
+                CmpItemKindModule = { bg = colors.yellow, fg = colors.crust },
+                CmpItemKindTypeParameter = { bg = colors.yellow, fg = colors.crust },
+
+                CmpItemKindField = { bg = colors.teal, fg = colors.crust },
+                CmpItemKindProperty = { bg = colors.teal, fg = colors.crust },
+                CmpItemKindEnumMember = { bg = colors.teal, fg = colors.crust },
+
+                CmpItemKindVariable = { bg = colors.sky, fg = colors.crust },
+                CmpItemKindValue = { bg = colors.sky, fg = colors.crust },
+                CmpItemKindReference = { bg = colors.sky, fg = colors.crust },
+
+                CmpItemKindSnippet = { bg = colors.mauve, fg = colors.crust },
+                CmpItemKindKeyword = { bg = colors.mauve, fg = colors.crust },
+
+                CmpItemKindConstant = { bg = colors.peach, fg = colors.crust },
+                CmpItemKindEnum = { bg = colors.peach, fg = colors.crust },
+
+                CmpItemKindText = { bg = colors.lavender, fg = colors.crust },
+                CmpItemKindFile = { bg = colors.lavender, fg = colors.crust },
+                CmpItemKindFolder = { bg = colors.lavender, fg = colors.crust },
+
+                CmpItemKindEvent = { bg = colors.red, fg = colors.crust },
+                CmpItemKindUnit = { bg = colors.red, fg = colors.crust },
+              }
+            end
+          '';
       };
     };
   };

home/editors/nvim/plugins/cmp/cmp.nix

@@ -46,7 +46,6 @@
           };
           documentation = {
             winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None";
-            col_offset = -3;
             side_padding = 0;
           };
         };
@@ -113,145 +112,4 @@
     cmp-cmdline.enable = true;
     cmp_luasnip.enable = true;
   };
-
-  # TODO: fix (https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-get-types-on-the-left-and-offset-the-menu)
-  highlight = {
-    PmenuSel = {
-      bg = "#282C34";
-      fg = "NONE";
-    };
-    Pmenu = {
-      fg = "#C5CDD9";
-      bg = "#22252A";
-    };
-
-    CmpItemAbbrDeprecated = {
-      fg = "#7E8294";
-      bg = "NONE";
-      strikethrough = true;
-    };
-    CmpItemAbbrMatch = {
-      fg = "#82AAFF";
-      bg = "NONE";
-      bold = true;
-    };
-    CmpItemAbbrMatchFuzzy = {
-      fg = "#82AAFF";
-      bg = "NONE";
-      bold = true;
-    };
-    CmpItemMenu = {
-      fg = "#C792EA";
-      bg = "NONE";
-      italic = true;
-    };
-
-    CmpItemKindField = {
-      fg = "#EED8DA";
-      bg = "#B5585F";
-    };
-    CmpItemKindProperty = {
-      fg = "#EED8DA";
-      bg = "#B5585F";
-    };
-    CmpItemKindEvent = {
-      fg = "#EED8DA";
-      bg = "#B5585F";
-    };
-
-    CmpItemKindText = {
-      fg = "#C3E88D";
-      bg = "#9FBD73";
-    };
-    CmpItemKindEnum = {
-      fg = "#C3E88D";
-      bg = "#9FBD73";
-    };
-    CmpItemKindKeyword = {
-      fg = "#C3E88D";
-      bg = "#9FBD73";
-    };
-
-    CmpItemKindConstant = {
-      fg = "#FFE082";
-      bg = "#D4BB6C";
-    };
-    CmpItemKindConstructor = {
-      fg = "#FFE082";
-      bg = "#D4BB6C";
-    };
-    CmpItemKindReference = {
-      fg = "#FFE082";
-      bg = "#D4BB6C";
-    };
-
-    CmpItemKindFunction = {
-      fg = "#EADFF0";
-      bg = "#A377BF";
-    };
-    CmpItemKindStruct = {
-      fg = "#EADFF0";
-      bg = "#A377BF";
-    };
-    CmpItemKindClass = {
-      fg = "#EADFF0";
-      bg = "#A377BF";
-    };
-    CmpItemKindModule = {
-      fg = "#EADFF0";
-      bg = "#A377BF";
-    };
-    CmpItemKindOperator = {
-      fg = "#EADFF0";
-      bg = "#A377BF";
-    };
-
-    CmpItemKindVariable = {
-      fg = "#C5CDD9";
-      bg = "#7E8294";
-    };
-    CmpItemKindFile = {
-      fg = "#C5CDD9";
-      bg = "#7E8294";
-    };
-
-    CmpItemKindUnit = {
-      fg = "#F5EBD9";
-      bg = "#D4A959";
-    };
-    CmpItemKindSnippet = {
-      fg = "#F5EBD9";
-      bg = "#D4A959";
-    };
-    CmpItemKindFolder = {
-      fg = "#F5EBD9";
-      bg = "#D4A959";
-    };
-
-    CmpItemKindMethod = {
-      fg = "#DDE5F5";
-      bg = "#6C8ED4";
-    };
-    CmpItemKindValue = {
-      fg = "#DDE5F5";
-      bg = "#6C8ED4";
-    };
-    CmpItemKindEnumMember = {
-      fg = "#DDE5F5";
-      bg = "#6C8ED4";
-    };
-
-    CmpItemKindInterface = {
-      fg = "#D8EEEB";
-      bg = "#58B5A8";
-    };
-    CmpItemKindColor = {
-      fg = "#D8EEEB";
-      bg = "#58B5A8";
-    };
-    CmpItemKindTypeParameter = {
-      fg = "#D8EEEB";
-      bg = "#58B5A8";
-    };
-  };
 }