diff --git a/lua/base46/integrations/cmp.lua b/lua/base46/integrations/cmp.lua index 5e9c212..f6b0613 100644 --- a/lua/base46/integrations/cmp.lua +++ b/lua/base46/integrations/cmp.lua @@ -6,7 +6,8 @@ return { CmpItemAbbr = { fg = colors.white }, CmpItemAbbrMatch = { fg = colors.blue, bold = true }, CmpBorder = { fg = colors.grey }, - CmpDocBorder = { fg = colors.grey }, + CmpDocBorder = { fg = colors.darker_black, bg = colors.darker_black }, + CmPmenu = { bg = colors.darker_black }, -- cmp item kinds CmpItemKindConstant = { fg = base16.base09 }, diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua index 58a301c..ec5736d 100644 --- a/lua/base46/integrations/treesitter.lua +++ b/lua/base46/integrations/treesitter.lua @@ -91,6 +91,10 @@ return { sp = "none", }, + TSPunctBracket = { + fg = theme.base0F, + }, + TSPunctDelimiter = { fg = theme.base0F, sp = "none", @@ -187,4 +191,8 @@ return { TSFieldKey = { fg = theme.base08, }, + + TSProperty = { + fg = theme.base08, + }, } diff --git a/lua/base46/themes/catppuccin_latte.lua b/lua/base46/themes/catppuccin_latte.lua new file mode 100644 index 0000000..023e439 --- /dev/null +++ b/lua/base46/themes/catppuccin_latte.lua @@ -0,0 +1,72 @@ +local M = {} + +M.base_30 = { + white = "#4C4F69", + darker_black = "#e6e8ec", + black = "#EFF1F5", -- nvim bg + black2 = "#e0e2e6", + one_bg = "#e4e6ea", -- real bg of onedark + one_bg2 = "#d9dbdf", + one_bg3 = "#ced0d4", + grey = "#c3c5c9", + grey_fg = "#b9bbbf", + grey_fg2 = "#b0b2b6", + light_grey = "#a6a8ac", + red = "#D20F39", + baby_pink = "#DD7878", + pink = "#ea76cb", + line = "#d9dbdf", -- for lines like vertsplit + green = "#40A02B", + vibrant_green = "#7eca9c", + nord_blue = "#7287FD", + blue = "#1e66f5", + yellow = "#df8e1d", + sun = "#dea95f", + purple = "#8839EF", + dark_purple = "#7c2de3", + teal = "#179299", + orange = "#FE640B", + cyan = "#04A5E5", + statusline_bg = "#e4e6ea", + lightbg = "#d9dbdf", + pmenu_bg = "#7287FD", + folder_bg = "#6C6C6C", +} + +M.base_16 = { + base00 = "#EFF1F5", + base01 = "#e4e6ea", + base02 = "#d9dbdf", + base03 = "#ced0d4", + base04 = "#c3c5c9", + base05 = "#4C4F69", + base06 = "#474a64", + base07 = "#41445e", + base08 = "#D20F39", + base09 = "#7c2de3", + base0A = "#df8e1d", + base0B = "#40A02B", + base0C = "#179299", + base0D = "#1e66f5", + base0E = "#8839EF", + base0F = "#62657f", +} + +vim.opt.bg = "light" + +M.polish_hl = { + TelescopePromptPrefix = { fg = M.base_30.white }, + TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white }, + FloatBorder = { fg = M.base_16.base05 }, + DiffAdd = { fg = M.base_16.base05 }, + TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 }, + WhichKeyDesc = { fg = M.base_30.white }, + Pmenu = { bg = M.base_30.black2 }, + St_pos_text = { fg = M.base_30.white }, + TSVariableBuiltin = { fg = M.base_30.red }, + TSProperty = { fg = M.base_30.teal }, +} + +M = require("base46").override_theme(M, "catppuccin_latte") + +return M diff --git a/lua/base46/themes/one_light.lua b/lua/base46/themes/one_light.lua index c5820da..fe2315d 100644 --- a/lua/base46/themes/one_light.lua +++ b/lua/base46/themes/one_light.lua @@ -58,7 +58,6 @@ M.polish_hl = { TelescopePromptPrefix = { fg = M.base_30.white }, TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white }, TSPunctBracket = { fg = M.base_30.nord_blue }, - NormalFloat = { bg = M.base_30.black2 }, FloatBorder = { fg = M.base_16.base05 }, DiffAdd = { fg = M.base_16.base05 }, TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 }, diff --git a/lua/base46/themes/onenord_light.lua b/lua/base46/themes/onenord_light.lua index 516b2a9..0a6e79f 100644 --- a/lua/base46/themes/onenord_light.lua +++ b/lua/base46/themes/onenord_light.lua @@ -58,7 +58,6 @@ M.polish_hl = { TelescopePromptPrefix = { fg = M.base_30.white }, TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white }, TSPunctBracket = { fg = M.base_30.nord_blue }, - NormalFloat = { bg = M.base_30.black }, FloatBorder = { fg = M.base_16.base05 }, DiffAdd = { fg = M.base_16.base05 }, St_pos_text = { fg = M.base_30.white },