A question about nvchad

[cpfaff]

I recently ran into nvchad and like the way they design their UI a lot as it looks very polished. It seems that it cannot directly use your beatiful interpretation of gruvbox that I love. The question is why is that and how complicated would it be to make it compatible with nvchad so it can become part of their themes library maybe even.

[cpfaff]

Got it but contains slight adjustments from my side I made for better visibility of some elements:

Dark:

-- Gruvbox Baby theme for NvChad
-- Inspired by gruvbox-baby with custom adjustments

local M = {}

-- Color palette
local palette = {
  dark = "#202020",
  foreground = "#ebdbb2",
  background = "#282828",
  background_dark = "#242424",
  bg_light = "#32302f",
  bg_lighter = "#3A3837",
  medium_gray = "#504945",
  comment = "#665c54",
  gray = "#DEDEDE",
  soft_yellow = "#EEBD35",
  soft_green = "#98971a",
  bright_yellow = "#fabd2f",
  orange = "#d65d0e",
  red = "#fb4934",
  error_red = "#cc241d",
  magenta = "#b16286",
  pink = "#D4879C",
  light_blue = "#7fa2ac",
  dark_gray = "#83a598",
  blue_gray = "#458588",
  forest_green = "#689d6a",
  clean_green = "#8ec07c",
  milk = "#E7D7AD",
  none = "NONE",
}

-- Diff backgrounds
palette.diff = {
  add = "#26332c",
  change = "#273842",
  delete = "#572E33",
  text = "#314753",
}

-- Base configuration function for the theme
local function get_colors(config)
  config = config or {}
  
  -- Handle intensity settings
  local intensity_map = {
    ["dark"] = {
      dark = "#161616",
      background = "#202020",
      background_dark = "#161616",
    },
    ["medium"] = {
      background = palette.background,
      background_dark = palette.background_dark,
    },
  }
  
  local colors = vim.deepcopy(palette)
  local background = config.background_color or palette.background
  
  if intensity_map[background] then
    colors = vim.tbl_extend("force", colors, intensity_map[background])
  end
  -- Handle transparency
  if config.transparent_mode then
    colors = vim.tbl_extend("force", colors, { 
      background = palette.none, 
      background_dark = palette.none 
    })
  end
  return colors
end

-- NvChad theme specification
M.base_30 = {
  white = "#ebdbb2",
  darker_black = "#242424", -- background_dark
  black = "#282828", -- background
  black2 = "#32302f", -- bg_light
  one_bg = "#353535",
  one_bg2 = "#3a3a3a",
  one_bg3 = "#404040",
  grey = "#504945", -- medium_gray
  grey_fg = "#5a524c",
  grey_fg2 = "#665c54", -- comment
  light_grey = "#7c6f64",
  red = "#fb4934",
  baby_pink = "#D4879C", -- pink
  pink = "#d3869b",
  line = "#32302f", -- bg_light
  green = "#98971a", -- soft_green
  vibrant_green = "#8ec07c", -- clean_green
  nord_blue = "#7fa2ac", -- light_blue
  blue = "#458588", -- blue_gray
  yellow = "#EEBD35", -- soft_yellow
  sun = "#fabd2f", -- bright_yellow
  purple = "#b16286", -- magenta
  dark_purple = "#8f3f71",
  teal = "#689d6a", -- forest_green
  orange = "#d65d0e",
  cyan = "#83a598", -- dark_gray
  statusline_bg = "#32302f", -- bg_light
  lightbg = "#3A3837", -- bg_lighter
  pmenu_bg = "#8ec07c", -- clean_green
  folder_bg = "#fabd2f", -- bright_yellow
}

-- Extended highlights for NvChad
M.base_16 = {
  base00 = "#282828", -- background
  base01 = "#3c3836",
  base02 = "#504945", -- medium_gray
  base03 = "#665c54", -- comment
  base04 = "#bdae93",
  base05 = "#ebdbb2", -- foreground
  base06 = "#fbf1c7",
  base07 = "#E7D7AD", -- milk
  base08 = "#fb4934", -- red
  base09 = "#d65d0e", -- orange
  base0A = "#EEBD35", -- soft_yellow
  base0B = "#98971a", -- soft_green
  base0C = "#689d6a", -- forest_green
  base0D = "#458588", -- blue_gray
  base0E = "#b16286", -- magenta
  base0F = "#D4879C", -- pink
}

-- Additional highlight overrides
M.type = "dark"

M.polish_hl = {
  -- TreeSitter related
  ["@variable"] = { fg = M.base_30.light_blue },
  ["@function"] = { fg = M.base_30.yellow },
  ["@function.builtin"] = { fg = M.base_30.yellow },
  ["@parameter"] = { fg = M.base_30.blue_gray, style = "nocombine" },
  ["@constructor"] = { fg = M.base_30.vibrant_green, style = "nocombine" },
  ["@keyword"] = { fg = M.base_30.red },
  ["@string"] = { fg = M.base_30.green, style = "nocombine" },
  ["@keyword.function"] = { fg = M.base_30.red },
  ["@constant"] = { fg = M.base_30.pink, style = "bold" },
  ["@type"] = { fg = M.base_30.vibrant_green },
  
  -- Telescope
  TelescopeBorder = { fg = M.base_30.darker_black, bg = M.base_30.darker_black },
  TelescopePromptBorder = { fg = M.base_30.grey, bg = M.base_30.grey },
  TelescopePromptNormal = { fg = M.base_30.white, bg = M.base_30.grey },
  TelescopePromptPrefix = { fg = M.base_30.yellow, bg = M.base_30.grey },
  TelescopeNormal = { bg = M.base_30.darker_black },
  TelescopePreviewTitle = { fg = M.base_30.black, bg = M.base_30.teal },
  TelescopePromptTitle = { fg = M.base_30.black, bg = M.base_30.yellow },
  TelescopeResultsTitle = { fg = M.base_30.darker_black, bg = M.base_30.darker_black },
  TelescopeSelection = { bg = M.base_30.grey },
  
  -- NvimTree
  NvimTreeNormal = { fg = M.base_30.white, bg = M.base_30.darker_black },
  NvimTreeNormalNC = { fg = M.base_30.white, bg = M.base_30.darker_black },
  NvimTreeFolderIcon = { fg = M.base_30.yellow },
  NvimTreeRootFolder = { fg = M.base_30.purple },
  NvimTreeGitDirty = { fg = M.base_30.red },
  NvimTreeGitNew = { fg = M.base_30.green },
  NvimTreeGitDeleted = { fg = M.base_30.red },
  NvimTreeExecFile = { fg = M.base_30.nord_blue, style = "NONE" },
  
  -- Cmp
  CmpItemAbbr = { fg = M.base_30.white, bg = "NONE" },
  CmpItemAbbrDeprecated = { fg = M.base_30.white, bg = "NONE", style = "strikethrough" },
  CmpItemAbbrMatch = { fg = M.base_30.nord_blue, bg = "NONE" },
  CmpItemKindVariable = { fg = M.base_30.purple },
  CmpItemKindFunction = { fg = M.base_30.orange },
  CmpItemKindClass = { fg = M.base_30.pink },
  CmpItemKindModule = { fg = M.base_30.yellow },
  
  -- Indent Blankline
  IndentBlanklineChar = { fg = "#313131" },
  IndentBlanklineContextChar = { fg = "#365050" },
  
  -- Diff
  DiffAdd = { bg = palette.diff.add },
  DiffChange = { bg = palette.diff.change },
  DiffDelete = { bg = palette.diff.delete },
  DiffText = { bg = palette.diff.text },
}

-- Override defaults with user config if any
function M.setup(user_config)
  user_config = user_config or {}
  local colors = get_colors(user_config)
  
  -- Apply any user-defined highlight overrides
  if user_config.highlights then
    M.polish_hl = vim.tbl_extend("force", M.polish_hl, user_config.highlights)
  end
  
  -- Apply transparency if enabled
  if user_config.transparent_mode then
    local transparent_hl = {
      Normal = { bg = "NONE" },
      NormalNC = { bg = "NONE" },
      NvimTreeNormal = { bg = "NONE" },
      NvimTreeNormalNC = { bg = "NONE" },
      TelescopeBorder = { bg = "NONE" },
      TelescopeNormal = { bg = "NONE" },
      TelescopePromptBorder = { bg = M.base_30.grey },
      StatusLine = { bg = "NONE" },
    }
    M.polish_hl = vim.tbl_extend("force", M.polish_hl, transparent_hl)
  end
  
  return M
end

return M

And light:

-- Gruvbox Baby Light theme for NvChad
-- Standalone light variant

local M = {}

-- Light variant color palette
local palette = {
  foreground = "#3c3836",
  background = "#fbf1c7",
  background_dark = "#f2e5bc",
  bg_light = "#ebdbb2",
  bg_lighter = "#d5c4a1",
  medium_gray = "#bdae93",
  comment = "#928374",
  gray = "#7c6f64",
  soft_yellow = "#b57614",
  soft_green = "#79740e",
  bright_yellow = "#d79921",
  orange = "#af3a03",
  red = "#9d0006",
  error_red = "#cc241d",
  magenta = "#8f3f71",
  pink = "#b16286",
  light_blue = "#458588",
  dark_gray = "#689d6a",
  blue_gray = "#076678",
  forest_green = "#427b58",
  clean_green = "#689d6a",
  milk = "#7c6f64",
  none = "NONE",
}

-- Diff backgrounds for light mode
palette.diff = {
  add = "#e6ffee",
  change = "#e6f1ff",
  delete = "#ffebe9",
  text = "#d0e8ff",
}

-- NvChad base_30 colors
M.base_30 = {
  white = palette.foreground,
  darker_black = palette.background_dark,
  black = palette.background, -- main background
  black2 = palette.bg_light,
  one_bg = "#e5d3a5", -- statusline background
  one_bg2 = "#d9c990", -- lighter background
  one_bg3 = "#ccbf81", -- even lighter background
  grey = palette.medium_gray,
  grey_fg = "#a89984",
  grey_fg2 = palette.comment,
  light_grey = "#7c6f64",
  red = palette.red,
  baby_pink = palette.pink,
  pink = "#b16286",
  line = palette.bg_light, -- cursor line
  green = palette.soft_green,
  vibrant_green = palette.clean_green,
  nord_blue = palette.light_blue,
  blue = palette.blue_gray,
  yellow = palette.soft_yellow,
  sun = palette.bright_yellow,
  purple = palette.magenta,
  dark_purple = "#8f3f71",
  teal = palette.forest_green,
  orange = palette.orange,
  cyan = palette.dark_gray,
  statusline_bg = palette.bg_light,
  lightbg = palette.bg_lighter,
  pmenu_bg = palette.clean_green,
  folder_bg = palette.bright_yellow,
}

-- Base 16 colors for syntax highlighting
M.base_16 = {
  base00 = palette.background,
  base01 = "#e5d3a5",
  base02 = palette.medium_gray,
  base03 = palette.comment,
  base04 = "#665c54",
  base05 = palette.foreground,
  base06 = "#3c3836",
  base07 = palette.milk,
  base08 = palette.red,
  base09 = palette.orange,
  base0A = palette.soft_yellow,
  base0B = palette.soft_green,
  base0C = palette.forest_green,
  base0D = palette.blue_gray,
  base0E = palette.magenta,
  base0F = palette.pink,
}

-- Set theme type
M.type = "light"

-- Override highlights for light theme
M.polish_hl = {
  -- TreeSitter related
  ["@variable"] = { fg = M.base_30.nord_blue },
  ["@function"] = { fg = M.base_30.yellow },
  ["@function.builtin"] = { fg = M.base_30.yellow },
  ["@parameter"] = { fg = M.base_30.blue, style = "nocombine" },
  ["@constructor"] = { fg = M.base_30.vibrant_green, style = "nocombine" },
  ["@keyword"] = { fg = M.base_30.red },
  ["@string"] = { fg = M.base_30.green, style = "nocombine" },
  ["@keyword.function"] = { fg = M.base_30.red },
  ["@constant"] = { fg = M.base_30.baby_pink, style = "bold" },
  ["@type"] = { fg = M.base_30.vibrant_green },
  
  -- UI elements
  FloatBorder = { fg = M.base_30.grey, bg = M.base_30.black },
  TelescopeBorder = { fg = M.base_30.black2, bg = M.base_30.black2 },
  TelescopePromptBorder = { fg = M.base_30.grey, bg = M.base_30.grey },
  TelescopePromptNormal = { fg = M.base_30.black, bg = M.base_30.grey },
  TelescopePromptPrefix = { fg = M.base_30.yellow, bg = M.base_30.grey },
  TelescopeNormal = { bg = M.base_30.black2 },
  TelescopePreviewTitle = { fg = M.base_30.black, bg = M.base_30.teal },
  TelescopePromptTitle = { fg = M.base_30.black, bg = M.base_30.yellow },
  TelescopeResultsTitle = { fg = M.base_30.black, bg = M.base_30.black2 },
  TelescopeSelection = { bg = M.base_30.grey },
  
  -- NvimTree
  NvimTreeNormal = { fg = M.base_30.black, bg = M.base_30.darker_black },
  NvimTreeNormalNC = { fg = M.base_30.black, bg = M.base_30.darker_black },
  NvimTreeRootFolder = { fg = M.base_30.purple, style = "bold" },
  NvimTreeGitDirty = { fg = M.base_30.red },
  NvimTreeGitNew = { fg = M.base_30.green },
  NvimTreeGitDeleted = { fg = M.base_30.red },
  NvimTreeFolderIcon = { fg = M.base_30.yellow },
  NvimTreeFolderName = { fg = M.base_30.blue },
  NvimTreeOpenedFolderName = { fg = M.base_30.blue, style = "bold,italic" },
  NvimTreeEmptyFolderName = { fg = M.base_30.grey, style = "italic" },
  NvimTreeIndentMarker = { fg = M.base_30.lightbg },
  NvimTreeSpecialFile = { fg = M.base_30.purple, style = "bold" },
  NvimTreeExecFile = { fg = M.base_30.nord_blue, style = "NONE" },
  
  -- Cmp
  CmpItemAbbr = { fg = M.base_30.black, bg = "NONE" },
  CmpItemAbbrDeprecated = { fg = M.base_30.black, bg = "NONE", style = "strikethrough" },
  CmpItemAbbrMatch = { fg = M.base_30.nord_blue, bg = "NONE", style = "bold" },
  CmpItemKindVariable = { fg = M.base_30.purple },
  CmpItemKindFunction = { fg = M.base_30.orange },
  CmpItemKindClass = { fg = M.base_30.baby_pink },
  CmpItemKindModule = { fg = M.base_30.yellow },
  
  -- Indent Blankline
  IndentBlanklineChar = { fg = "#d5c4a1" },
  IndentBlanklineContextChar = { fg = "#a89984" },
  
  -- Diff
  DiffAdd = { bg = palette.diff.add },
  DiffChange = { bg = palette.diff.change },
  DiffDelete = { bg = palette.diff.delete },
  DiffText = { bg = palette.diff.text },
}

-- Apply customizations from the user config
function M.setup(user_config)
  user_config = user_config or {}
  
  -- Apply any user-defined highlight overrides
  if user_config.highlights then
    M.polish_hl = vim.tbl_extend("force", M.polish_hl, user_config.highlights)
  end
  
  -- Apply transparency if enabled
  if user_config.transparent_mode then
    local transparent_hl = {
      Normal = { bg = "NONE" },
      NormalNC = { bg = "NONE" },
      NvimTreeNormal = { bg = "NONE" },
      NvimTreeNormalNC = { bg = "NONE" },
      TelescopeBorder = { bg = "NONE" },
      TelescopeNormal = { bg = "NONE" },
      TelescopePromptBorder = { bg = M.base_30.grey },
      StatusLine = { bg = "NONE" },
    }
    M.polish_hl = vim.tbl_extend("force", M.polish_hl, transparent_hl)
  end
  
  return M
end

return M

[cpfaff]

I was almost there. Here are the revised versions. Would you mind if I contribute these to the base46 repository so all nvchad users can benefit and directly apply your theme. And would you give it a quick review so we see that everything is really fine and along your original idea.

Dark variant:

-- Credits to original https://github.com/luisiacc/gruvbox-baby
-- This is an adapted version for NvChad's base46 system

local M = {}

M.base_30 = {
  white = "#ebdbb2",
  darker_black = "#242424", -- background_dark
  black = "#282828", -- background
  black2 = "#32302f", -- bg_light
  one_bg = "#353535",
  one_bg2 = "#3a3a3a",
  one_bg3 = "#404040",
  grey = "#504945", -- medium_gray
  grey_fg = "#5a524c",
  grey_fg2 = "#665c54", -- comment
  light_grey = "#7c6f64",
  red = "#fb4934",
  baby_pink = "#D4879C", -- pink
  pink = "#d3869b",
  line = "#32302f", -- bg_light
  green = "#98971a", -- soft_green
  vibrant_green = "#8ec07c", -- clean_green
  nord_blue = "#7fa2ac", -- light_blue
  blue = "#458588", -- blue_gray
  yellow = "#EEBD35", -- soft_yellow
  sun = "#fabd2f", -- bright_yellow
  purple = "#b16286", -- magenta
  dark_purple = "#8f3f71",
  teal = "#689d6a", -- forest_green
  orange = "#d65d0e",
  cyan = "#83a598", -- dark_gray
  statusline_bg = "#32302f", -- bg_light
  lightbg = "#3A3837", -- bg_lighter
  pmenu_bg = "#8ec07c", -- clean_green
  folder_bg = "#fabd2f", -- bright_yellow
}

M.base_16 = {
  base00 = "#282828", -- background
  base01 = "#3c3836",
  base02 = "#504945", -- medium_gray
  base03 = "#665c54", -- comment
  base04 = "#bdae93",
  base05 = "#ebdbb2", -- foreground
  base06 = "#fbf1c7",
  base07 = "#E7D7AD", -- milk
  base08 = "#fb4934", -- red
  base09 = "#d65d0e", -- orange
  base0A = "#EEBD35", -- soft_yellow
  base0B = "#98971a", -- soft_green
  base0C = "#689d6a", -- forest_green
  base0D = "#458588", -- blue_gray
  base0E = "#b16286", -- magenta
  base0F = "#D4879C", -- pink
}

M.type = "dark"

M = require("base46").override_theme(M, "gruvbox-baby")

-- Additional highlight overrides organized by integration
M.polish_hl = {
  -- TreeSitter integration
  treesitter = {
    ["@variable"] = { fg = M.base_30.nord_blue },
    ["@function"] = { fg = M.base_30.yellow },
    ["@function.builtin"] = { fg = M.base_30.yellow },
    ["@parameter"] = { fg = M.base_30.blue },
    ["@constructor"] = { fg = M.base_30.vibrant_green },
    ["@keyword"] = { fg = M.base_30.red },
    ["@string"] = { fg = M.base_30.green },
    ["@keyword.function"] = { fg = M.base_30.red },
    ["@constant"] = { fg = M.base_30.baby_pink, bold = true },
    ["@type"] = { fg = M.base_30.vibrant_green },
  },
  
  -- Telescope integration
  telescope = {
    TelescopeBorder = { fg = M.base_30.darker_black, bg = M.base_30.darker_black },
    TelescopePromptBorder = { fg = M.base_30.grey, bg = M.base_30.grey },
    TelescopePromptNormal = { fg = M.base_30.white, bg = M.base_30.grey },
    TelescopePromptPrefix = { fg = M.base_30.yellow, bg = M.base_30.grey },
    TelescopeNormal = { bg = M.base_30.darker_black },
    TelescopePreviewTitle = { fg = M.base_30.black, bg = M.base_30.teal },
    TelescopePromptTitle = { fg = M.base_30.black, bg = M.base_30.yellow },
    TelescopeResultsTitle = { fg = M.base_30.darker_black, bg = M.base_30.darker_black },
    TelescopeSelection = { bg = M.base_30.grey },
  },
  
  -- NvimTree integration
  nvimtree = {
    NvimTreeNormal = { fg = M.base_30.white, bg = M.base_30.darker_black },
    NvimTreeNormalNC = { fg = M.base_30.white, bg = M.base_30.darker_black },
    NvimTreeFolderIcon = { fg = M.base_30.yellow },
    NvimTreeRootFolder = { fg = M.base_30.purple },
    NvimTreeGitDirty = { fg = M.base_30.red },
    NvimTreeGitNew = { fg = M.base_30.green },
    NvimTreeGitDeleted = { fg = M.base_30.red },
    NvimTreeExecFile = { fg = M.base_30.nord_blue },
  },
  
  -- Cmp integration
  cmp = {
    CmpItemAbbr = { fg = M.base_30.white, bg = "NONE" },
    CmpItemAbbrDeprecated = { fg = M.base_30.white, bg = "NONE", strikethrough = true },
    CmpItemAbbrMatch = { fg = M.base_30.nord_blue, bg = "NONE" },
    CmpItemKindVariable = { fg = M.base_30.purple },
    CmpItemKindFunction = { fg = M.base_30.orange },
    CmpItemKindClass = { fg = M.base_30.baby_pink },
    CmpItemKindModule = { fg = M.base_30.yellow },
  },
  
  -- Indent Blankline integration
  blankline = {
    IndentBlanklineChar = { fg = "#313131" },
    IndentBlanklineContextChar = { fg = "#365050" },
  },
  
  -- Git integration for diffs
  git = {
    DiffAdd = { bg = "#26332c" },
    DiffChange = { bg = "#273842" },
    DiffDelete = { bg = "#572E33" },
    DiffText = { bg = "#314753" },
  },
  
  -- Hop integration
  hop = {
    HopNextKey = { fg = M.base_30.yellow, bg = M.base_30.darker_black, bold = true },
    HopNextKey1 = { fg = M.base_30.yellow, bg = M.base_30.darker_black, bold = true },
    HopNextKey2 = { fg = M.base_16.base07, bg = M.base_30.darker_black },
    HopUnmatched = { fg = M.base_30.grey_fg, bg = M.base_30.darker_black },
    HopCursor = { fg = M.base_30.white, bg = M.base_30.blue },
    HopPreview = { fg = M.base_30.green, bg = M.base_30.darker_black, italic = true },
  },
}

return M

And the light variant:

-- Credits to original https://github.com/luisiacc/gruvbox-baby
-- This is an adapted light version for NvChad's base46 system

local M = {}

M.base_30 = {
  white = "#3c3836",
  darker_black = "#f2e5bc", -- background_dark
  black = "#fbf1c7", -- main background
  black2 = "#ebdbb2", -- lighter background
  one_bg = "#e5d3a5", -- statusline background
  one_bg2 = "#d9c990", -- lighter background
  one_bg3 = "#ccbf81", -- even lighter background
  grey = "#bdae93", -- medium_gray
  grey_fg = "#a89984",
  grey_fg2 = "#928374", -- comment
  light_grey = "#7c6f64",
  red = "#9d0006",
  baby_pink = "#b16286", -- pink
  pink = "#b16286",
  line = "#ebdbb2", -- cursor line
  green = "#79740e", -- soft_green
  vibrant_green = "#689d6a", -- clean_green
  nord_blue = "#458588", -- light_blue
  blue = "#076678", -- blue_gray
  yellow = "#b57614", -- soft_yellow
  sun = "#d79921", -- bright_yellow
  purple = "#8f3f71", -- magenta
  dark_purple = "#8f3f71",
  teal = "#427b58", -- forest_green
  orange = "#af3a03",
  cyan = "#689d6a", -- dark_gray
  statusline_bg = "#ebdbb2", -- bg_light
  lightbg = "#d5c4a1", -- bg_lighter
  pmenu_bg = "#689d6a", -- clean_green
  folder_bg = "#d79921", -- bright_yellow
}

M.base_16 = {
  base00 = "#fbf1c7", -- background
  base01 = "#e5d3a5",
  base02 = "#bdae93", -- medium_gray
  base03 = "#928374", -- comment
  base04 = "#665c54",
  base05 = "#3c3836", -- foreground
  base06 = "#3c3836",
  base07 = "#7c6f64", -- milk
  base08 = "#9d0006", -- red
  base09 = "#af3a03", -- orange
  base0A = "#b57614", -- soft_yellow
  base0B = "#79740e", -- soft_green
  base0C = "#427b58", -- forest_green
  base0D = "#076678", -- blue_gray
  base0E = "#8f3f71", -- magenta
  base0F = "#b16286", -- pink
}

M.type = "light"

M = require("base46").override_theme(M, "gruvbox-baby-light")

-- Override highlights for light theme organized by integration
M.polish_hl = {
  -- TreeSitter integration
  treesitter = {
    ["@variable"] = { fg = M.base_30.nord_blue },
    ["@function"] = { fg = M.base_30.yellow },
    ["@function.builtin"] = { fg = M.base_30.yellow },
    ["@parameter"] = { fg = M.base_30.blue },
    ["@constructor"] = { fg = M.base_30.vibrant_green },
    ["@keyword"] = { fg = M.base_30.red },
    ["@string"] = { fg = M.base_30.green },
    ["@keyword.function"] = { fg = M.base_30.red },
    ["@constant"] = { fg = M.base_30.baby_pink, bold = true },
    ["@type"] = { fg = M.base_30.vibrant_green },
  },
  
  -- Telescope integration
  telescope = {
    TelescopeBorder = { fg = M.base_30.black2, bg = M.base_30.black2 },
    TelescopePromptBorder = { fg = M.base_30.grey, bg = M.base_30.grey },
    TelescopePromptNormal = { fg = M.base_30.black, bg = M.base_30.grey },
    TelescopePromptPrefix = { fg = M.base_30.yellow, bg = M.base_30.grey },
    TelescopeNormal = { bg = M.base_30.black2 },
    TelescopePreviewTitle = { fg = M.base_30.black, bg = M.base_30.teal },
    TelescopePromptTitle = { fg = M.base_30.black, bg = M.base_30.yellow },
    TelescopeResultsTitle = { fg = M.base_30.black, bg = M.base_30.black2 },
    TelescopeSelection = { bg = M.base_30.grey },
  },
  
  -- UI elements - These should be organized into their respective integrations
  defaults = {
    FloatBorder = { fg = M.base_30.grey, bg = M.base_30.black },
  },
  
  -- NvimTree integration
  nvimtree = {
    NvimTreeNormal = { fg = M.base_30.white, bg = M.base_30.darker_black },
    NvimTreeNormalNC = { fg = M.base_30.white, bg = M.base_30.darker_black },
    NvimTreeRootFolder = { fg = M.base_30.purple, bold = true },
    NvimTreeGitDirty = { fg = M.base_30.red },
    NvimTreeGitNew = { fg = M.base_30.green },
    NvimTreeGitDeleted = { fg = M.base_30.red },
    NvimTreeFolderIcon = { fg = M.base_30.yellow },
    NvimTreeFolderName = { fg = M.base_30.blue },
    NvimTreeOpenedFolderName = { fg = M.base_30.blue, bold = true, italic = true },
    NvimTreeEmptyFolderName = { fg = M.base_30.grey, italic = true },
    NvimTreeIndentMarker = { fg = M.base_30.lightbg },
    NvimTreeSpecialFile = { fg = M.base_30.purple, bold = true },
    NvimTreeExecFile = { fg = M.base_30.nord_blue },
  },
  
  -- Cmp integration
  cmp = {
    CmpItemAbbr = { fg = M.base_30.white, bg = "NONE" },
    CmpItemAbbrDeprecated = { fg = M.base_30.white, bg = "NONE", strikethrough = true },
    CmpItemAbbrMatch = { fg = M.base_30.nord_blue, bg = "NONE", bold = true },
    CmpItemKindVariable = { fg = M.base_30.purple },
    CmpItemKindFunction = { fg = M.base_30.orange },
    CmpItemKindClass = { fg = M.base_30.baby_pink },
    CmpItemKindModule = { fg = M.base_30.yellow },
  },
  
  -- Indent Blankline integration
  blankline = {
    IndentBlanklineChar = { fg = "#d5c4a1" },
    IndentBlanklineContextChar = { fg = "#a89984" },
  },
  
  -- Git integration for diffs
  git = {
    DiffAdd = { bg = "#e6ffee" },
    DiffChange = { bg = "#e6f1ff" },
    DiffDelete = { bg = "#ffebe9" },
    DiffText = { bg = "#d0e8ff" },
  },
  
  -- Hop integration
  hop = {
    HopNextKey = { fg = M.base_30.yellow, bg = M.base_30.one_bg, bold = true },
    HopNextKey1 = { fg = M.base_30.yellow, bg = M.base_30.one_bg, bold = true },
    HopNextKey2 = { fg = M.base_30.blue, bg = M.base_30.one_bg },
    HopUnmatched = { fg = M.base_30.grey, bg = M.base_30.one_bg },
    HopCursor = { fg = M.base_30.black, bg = M.base_30.blue },
    HopPreview = { fg = M.base_30.green, bg = M.base_30.one_bg, italic = true },
  },
}

return M

[luisiacc]

sry didn't saw this one, sure! create a pr for it I'll merge it