clean stuff

lua/base46/init.lua

@@ -77,11 +77,11 @@ M.extend_default_hl = function(highlights)
    local glassy = require "base46.glassy"
    local polish_hl = M.get_theme_tb "polish_hl"
 
+   -- polish themes
    if polish_hl then
-      -- polish themes
       for key, value in pairs(polish_hl) do
          if highlights[key] then
-            highlights[key] = value
+            highlights[key] = M.merge_tb(highlights[key], value)
          end
       end
    end

lua/base46/integrations/tbline.lua

@@ -36,6 +36,12 @@ return {
       bg = colors.black2,
    },
 
+   TblineTabNewBtn = {
+      fg = colors.white,
+      bg = colors.one_bg3,
+      bold = true,
+   },
+
    TbLineTabOn = {
       fg = colors.black,
       bg = colors.nord_blue,
@@ -60,12 +66,12 @@ return {
    TbLineThemeToggleBtn = {
       bold = true,
       fg = colors.white,
-      bg = colors.black,
+      bg = colors.one_bg3,
    },
 
-   TblineTabNewBtn = {
+   TbLineCloseAllBufsBtn = {
-      fg = colors.white,
-      bg = colors.one_bg3,
       bold = true,
+      bg = colors.red,
+      fg = colors.black,
    },
 }

lua/base46/themes/ayu-dark.lua

@@ -53,30 +53,12 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-
+   TSTagDelimiter = { fg = M.base_30.cyan },
-   TSTagDelimiter = {
+   TSFunction = { fg = M.base_30.orange },
-      fg = M.base_30.cyan,
+   luaTSField = { fg = M.base_16.base0D },
-   },
+   TSParameter = { fg = M.base_16.base0F },
-
+   TSConstructor = { fg = M.base_16.base0A },
-   TSFunction = {
+   TSTagAttribute = { fg = M.base_30.orange },
-      fg = M.base_30.orange,
-   },
-
-   luaTSField = {
-      fg = M.base_16.base0D,
-   },
-
-   TSParameter = {
-      fg = M.base_16.base0F,
-   },
-
-   TSConstructor = {
-      fg = M.base_16.base0A,
-   },
-
-   TSTagAttribute = {
-      fg = M.base_30.orange,
-   },
 }
 
 M = require("base46").override_theme(M, "ayu-dark")

lua/base46/themes/blossom.lua

@@ -27,8 +27,8 @@ M.base_30 = {
    teal = "#4b6987",
    orange = "#cc836c",
    cyan = "#75998e",
-   statusline_bg = "#dfd8d5",
+   statusline_bg = "#dcd5d2",
-   lightbg = "#cac3c0",
+   lightbg = "#cdc6c3",
    pmenu_bg = "#857e7b",
    folder_bg = "#746d6a",
 }
@@ -53,18 +53,16 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   WhichKeyDesc = {
+   WhichKeyDesc = { fg = M.base_30.white },
-      fg = M.base_30.white,
+   WhichKey = { fg = M.base_30.white },
-   },
-
-   WhichKey = {
-      fg = M.base_30.white,
-   },
 
    TbLineThemeToggleBtn = {
       fg = M.base_30.black,
       bg = M.base_30.white,
    },
+
+   IndentBlanklineContextStart = { bg = M.base_30.black2 },
+   St_pos_text = { fg = M.base_30.white },
 }
 
 vim.opt.bg = "light"

lua/base46/themes/catppuccin.lua

@@ -54,17 +54,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSVariable = {
+   TSVariable = { fg = M.base_30.lavender },
-      fg = M.base_30.lavender,
+   TSProperty = { fg = M.base_30.teal },
-   },
+   TSVariableBuiltin = { fg = M.base_30.red },
-
-   TSProperty = {
-      fg = M.base_30.teal,
-   },
-
-   TSVariableBuiltin = {
-      fg = M.base_30.red,
-   },
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/chadracula.lua

@@ -53,14 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-
+   TSFuncBuiltin = { fg = M.base_30.cyan },
-   TSFuncBuiltin = {
+   TSNumber = { fg = M.base_30.purple },
-      fg = M.base_30.cyan,
-   },
-
-   TSNumber = {
-      fg = M.base_30.purple,
-   },
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/chocolate.lua

@@ -57,41 +57,15 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSField = {
+   TSField = { fg = M.base_30.purple },
-      fg = M.base_30.purple,
+   TSVariable = { fg = M.base_16.base06 },
-   },
+   TSModule = { fg = M.base_30.beige },
-
+   Operator = { fg = M.base_30.blue },
-   TSVariable = {
+   TSAttribute = { fg = M.base_30.cyan },
-      fg = M.base_16.base06,
+   TSPunctBracket = { fg = M.base_16.base06 },
-   },
+   TSParenthesis = { link = "TSPunctBracket" },
-
+   TSParameter = { fg = M.base_30.green },
-   TSModule = {
+   TSFuncBuiltin = { fg = M.base_30.yellow },
-      fg = M.base_30.beige,
-   },
-
-   Operator = {
-      fg = M.base_30.blue,
-   },
-
-   TSAttribute = {
-      fg = M.base_30.cyan,
-   },
-
-   TSPunctBracket = {
-      fg = M.base_16.base06,
-   },
-
-   TSParenthesis = {
-      link = "TSPunctBracket",
-   },
-
-   TSParameter = {
-      fg = M.base_30.green,
-   },
-
-   TSFuncBuiltin = {
-      fg = M.base_30.yellow,
-   },
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/doomchad.lua

@@ -53,9 +53,7 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSFieldKey = {
+   TSFieldKey = { fg = M.base_30.blue },
-    fg  = M.base_30.blue
-  }
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/everforest.lua

@@ -55,21 +55,10 @@ M.base_16 = {
 vim.opt.bg = "dark"
 
 M.polish_hl = {
-   TSPunctBracket = {
+   TSPunctBracket = { fg = M.base_30.red },
-      fg = M.base_30.red,
+   TSTag = { fg = M.base_30.orange },
-   },
+   TSTagDelimiter = { fg = M.base_30.green },
-
+   TSConstructor = { fg = "#7fbbb3" },
-   TSTag = {
-      fg = M.base_30.orange,
-   },
-
-   TSTagDelimiter = {
-      fg = M.base_30.green,
-   },
-
-   TSConstructor = {
-      fg = "#7fbbb3",
-   },
 }
 
 M = require("base46").override_theme(M, "everforest")

lua/base46/themes/everforest_light.lua

@@ -27,8 +27,8 @@ M.base_30 = {
    teal = "#69a59d",
    orange = "#F7954F",
    cyan = "#7521e9",
-   statusline_bg = "#f0ead9",
+   statusline_bg = "#ede7d6",
-   lightbg = "#c9c3b2",
+   lightbg = "#d3cdbc",
    pmenu_bg = "#5f9b93",
    folder_bg = "#747b6e",
 }
@@ -53,42 +53,18 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   DiffAdd = {
+   DiffAdd = { fg = M.base_30.green },
-      fg = M.base_30.green,
+   TSTag = { fg = M.base_30.orange },
-   },
+   TSField = { fg = M.base_16.base05 },
-
+   TSInclude = { fg = M.base_16.base08 },
-   TSTag = {
+   TSConstructor = { fg = M.base_30.blue },
-      fg = M.base_30.orange,
+   WhichKeyDesc = { fg = M.base_30.white },
-   },
+   WhichKey = { fg = M.base_30.white },
-
+   NvimTreeFolderName = { fg = "#4e565c" },
-   TSField = {
+   TbLineThemeToggleBtn = { bg = M.base_30.one_bg },
-      fg = M.base_16.base05,
+   Pmenu = { bg = M.base_30.black2 },
-   },
+   IndentBlanklineContextStart = { bg = M.base_30.black2 },
-
+   St_pos_text = { fg = M.base_30.white },
-   TSInclude = {
-      fg = M.base_16.base08,
-   },
-
-   TSConstructor = {
-      fg = M.base_30.blue,
-   },
-
-   WhichKeyDesc = {
-      fg = M.base_30.white,
-   },
-
-   WhichKey = {
-      fg = M.base_30.white,
-   },
-
-   NvimTreeFolderName = {
-      fg = "#4e565c",
-   },
-
-   TbLineThemeToggleBtn = {
-      fg = M.base_30.black,
-      bg = M.base_30.white,
-   },
 }
 
 vim.opt.bg = "light"

lua/base46/themes/gruvbox_light.lua

@@ -55,10 +55,7 @@ M.base_16 = {
 vim.opt.bg = "light"
 
 M.polish_hl = {
-   TbLineThemeToggleBtn = {
+   TbLineThemeToggleBtn = { fg = M.base_30.black, bg = M.base_30.white },
-      fg = M.base_30.black,
-      bg = M.base_30.white,
-   },
 }
 
 M = require("base46").override_theme(M, "gruvbox_light")

lua/base46/themes/kanagawa.lua

@@ -53,17 +53,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSInclude = {
+   TSInclude = { fg = M.base_30.purple },
-      fg = M.base_30.purple,
+   TSURI = { fg = M.base_30.blue },
-   },
+   TSTagDelimiter = { fg = M.base_30.red },
-
-   TSURI = {
-      fg = M.base_30.blue,
-   },
-
-   TSTagDelimiter = {
-      fg = M.base_30.red,
-   },
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/monekai.lua

@@ -53,13 +53,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSParameter = {
+   TSParameter = { fg = M.base_30.blue },
-      fg = M.base_30.blue,
+   TSFieldKey = { fg = M.base_30.red },
-   },
-   TSFieldKey = {
-      fg = M.base_30.red,
-   },
 }
+
 vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "monekai")

lua/base46/themes/mountain.lua

@@ -53,10 +53,7 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSVariable = {
+   TSVariable = { fg = M.base_16.base05 },
-      fg = M.base_16.base05,
-   },
-
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/nightowl.lua

@@ -53,21 +53,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSParameter = {
+   TSParameter = { fg = M.base_30.orange },
-      fg = M.base_30.orange,
+   TSKeywordReturn = { fg = M.base_30.cyan },
-   },
+   TSConditional = { fg = M.base_30.cyan },
-
+   PmenuSel = { bg = M.base_30.blue },
-   TSKeywordReturn = {
-      fg = M.base_30.cyan,
-   },
-
-   TSConditional = {
-      fg = M.base_30.cyan,
-   },
-
-   PmenuSel = {
-      bg = M.base_30.blue,
-   },
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/nord.lua

@@ -53,13 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSPunctBracket = {
+   TSPunctBracket = { fg = M.base_30.white },
-      fg = M.base_30.white,
+   TSPunctDelimiter = { fg = M.base_30.white },
-   },
-
-   TSPunctDelimiter = {
-      fg = M.base_30.white,
-   },
 }
 vim.opt.bg = "dark"
 

lua/base46/themes/one_light.lua

@@ -55,43 +55,16 @@ M.base_16 = {
 vim.opt.bg = "light"
 
 M.polish_hl = {
-   WhichKeyDesc = {
+   TelescopePromptPrefix = { fg = M.base_30.white },
-      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 },
-   WhichKey = {
+   FloatBorder = { fg = M.base_16.base05 },
-      fg = M.base_30.white,
+   DiffAdd = { fg = M.base_16.base05 },
-   },
+   TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 },
-
+   WhichKeyDesc = { fg = M.base_30.white },
-   TelescopePromptPrefix = {
+   Pmenu = { bg = M.base_30.black2 },
-      fg = M.base_30.white,
+   St_pos_text = { 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,
-   },
-
-   TbLineThemeToggleBtn = {
-      fg = M.base_30.black,
-      bg = M.base_30.white,
-   },
 }
 
 M = require("base46").override_theme(M, "one_light")

lua/base46/themes/onedark.lua

@@ -7,7 +7,7 @@ M.base_30 = {
    black2 = "#252931",
    one_bg = "#282c34", -- real bg of onedark
    one_bg2 = "#353b45",
-   one_bg3 = "#30343c",
+   one_bg3 = "#373b43",
    grey = "#42464e",
    grey_fg = "#565c64",
    grey_fg2 = "#6f737b",

lua/base46/themes/onenord_light.lua

@@ -53,38 +53,15 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   WhichKeyDesc = {
+   WhichKeyDesc = { fg = M.base_30.white },
-      fg = M.base_30.white,
+   WhichKey = { fg = M.base_30.white },
-   },
+   TelescopePromptPrefix = { fg = M.base_30.white },
-
+   TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-   WhichKey = {
+   TSPunctBracket = { fg = M.base_30.nord_blue },
-      fg = M.base_30.white,
+   NormalFloat = { bg = M.base_30.black },
-   },
+   FloatBorder = { fg = M.base_16.base05 },
-
+   DiffAdd = { fg = M.base_16.base05 },
-   TelescopePromptPrefix = {
+   St_pos_text = { fg = M.base_30.white },
-      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,
-   },
 }
 
 M = require("base46").override_theme(M, "onenord_light")

lua/base46/themes/palenight.lua

@@ -53,12 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSInclude = {
+   TSInclude = { fg = M.base_30.purple },
-      fg = M.base_30.purple,
+   TSFieldKey = { fg = M.base_30.orange },
-   },
-   TSFieldKey = {
-      fg = M.base_30.orange,
-   },
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/radium.lua

@@ -53,13 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSPunctBracket = {
+   TSPunctBracket = { fg = M.base_16.base07 },
-      fg = M.base_16.base07,
+   TSParenthesis = { link = "TSPunctBracket" },
-   },
-
-   TSParenthesis = {
-     link = "TSPunctBracket"
-   },
 }
 
 vim.opt.bg = "dark"

lua/base46/themes/tomorrow_night.lua

@@ -55,10 +55,7 @@ M.base_16 = {
 vim.opt.bg = "dark"
 
 M.polish_hl = {
-   PmenuSel = {
+   PmenuSel = { fg = M.base_30.black, bg = M.base_30.red },
-      fg = M.base_30.black,
-      bg = M.base_30.red,
-   },
 }
 
 M = require("base46").override_theme(M, "tomorrow_night")

lua/base46/themes/vscode_dark.lua

@@ -55,33 +55,13 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-   TSParameter = {
+   TSParameter = { fg = M.base_30.blue },
-      fg = M.base_30.blue,
+   TSKeyword = { fg = M.base_30.blue },
-   },
+   TSVariable = { fg = M.base_30.cyan },
-
+   luaTSField = { fg = M.base_30.teal },
-   TSKeyword = {
+   TSFieldKey = { fg = M.base_30.green1 },
-      fg = M.base_30.blue,
+   TSKeywordReturn = { fg = M.base_16.base0E },
-   },
+   TSKeywordFunction = { fg = M.base_30.teal },
-
-   TSVariable = {
-      fg = M.base_30.cyan,
-   },
-
-   luaTSField = {
-      fg = M.base_30.teal,
-   },
-
-   TSFieldKey = {
-      fg = M.base_30.green1,
-   },
-
-   TSKeywordReturn = {
-      fg = M.base_16.base0E,
-   },
-
-   TSKeywordFunction = {
-      fg = M.base_30.teal,
-   },
 }
 
 vim.opt.bg = "dark"