From 92062933d5c9d1289c3b9c363f66bd6615580cb0 Mon Sep 17 00:00:00 2001 From: siduck Date: Mon, 27 Jun 2022 10:10:02 +0530 Subject: [PATCH] clean stuff --- lua/base46/init.lua | 4 +- lua/base46/integrations/tbline.lua | 14 +++++-- lua/base46/themes/ayu-dark.lua | 30 +++------------ lua/base46/themes/blossom.lua | 16 ++++---- lua/base46/themes/catppuccin.lua | 14 ++----- lua/base46/themes/chadracula.lua | 10 +---- lua/base46/themes/chocolate.lua | 44 +++++----------------- lua/base46/themes/doomchad.lua | 4 +- lua/base46/themes/everforest.lua | 19 ++-------- lua/base46/themes/everforest_light.lua | 52 +++++++------------------- lua/base46/themes/gruvbox_light.lua | 5 +-- lua/base46/themes/kanagawa.lua | 14 ++----- lua/base46/themes/monekai.lua | 9 ++--- lua/base46/themes/mountain.lua | 5 +-- lua/base46/themes/nightowl.lua | 19 ++-------- lua/base46/themes/nord.lua | 9 +---- lua/base46/themes/one_light.lua | 47 +++++------------------ lua/base46/themes/onedark.lua | 2 +- lua/base46/themes/onenord_light.lua | 41 +++++--------------- lua/base46/themes/palenight.lua | 8 +--- lua/base46/themes/radium.lua | 9 +---- lua/base46/themes/tomorrow_night.lua | 5 +-- lua/base46/themes/vscode_dark.lua | 34 ++++------------- 23 files changed, 104 insertions(+), 310 deletions(-) diff --git a/lua/base46/init.lua b/lua/base46/init.lua index 814e59d..29eaf7f 100644 --- a/lua/base46/init.lua +++ b/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 diff --git a/lua/base46/integrations/tbline.lua b/lua/base46/integrations/tbline.lua index 86e253a..526a390 100644 --- a/lua/base46/integrations/tbline.lua +++ b/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 = { - fg = colors.white, - bg = colors.one_bg3, + TbLineCloseAllBufsBtn = { bold = true, + bg = colors.red, + fg = colors.black, }, } diff --git a/lua/base46/themes/ayu-dark.lua b/lua/base46/themes/ayu-dark.lua index f7c4f16..8e64ac9 100644 --- a/lua/base46/themes/ayu-dark.lua +++ b/lua/base46/themes/ayu-dark.lua @@ -53,30 +53,12 @@ M.base_16 = { } M.polish_hl = { - - TSTagDelimiter = { - fg = M.base_30.cyan, - }, - - TSFunction = { - 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, - }, + TSTagDelimiter = { fg = M.base_30.cyan }, + TSFunction = { 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") diff --git a/lua/base46/themes/blossom.lua b/lua/base46/themes/blossom.lua index 0a2ae41..2de2ffe 100644 --- a/lua/base46/themes/blossom.lua +++ b/lua/base46/themes/blossom.lua @@ -27,8 +27,8 @@ M.base_30 = { teal = "#4b6987", orange = "#cc836c", cyan = "#75998e", - statusline_bg = "#dfd8d5", - lightbg = "#cac3c0", + statusline_bg = "#dcd5d2", + lightbg = "#cdc6c3", pmenu_bg = "#857e7b", folder_bg = "#746d6a", } @@ -53,18 +53,16 @@ M.base_16 = { } M.polish_hl = { - WhichKeyDesc = { - fg = M.base_30.white, - }, - - WhichKey = { - fg = M.base_30.white, - }, + WhichKeyDesc = { 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" diff --git a/lua/base46/themes/catppuccin.lua b/lua/base46/themes/catppuccin.lua index d18ab17..8c3be92 100644 --- a/lua/base46/themes/catppuccin.lua +++ b/lua/base46/themes/catppuccin.lua @@ -54,17 +54,9 @@ M.base_16 = { } M.polish_hl = { - TSVariable = { - fg = M.base_30.lavender, - }, - - TSProperty = { - fg = M.base_30.teal, - }, - - TSVariableBuiltin = { - fg = M.base_30.red, - }, + TSVariable = { fg = M.base_30.lavender }, + TSProperty = { fg = M.base_30.teal }, + TSVariableBuiltin = { fg = M.base_30.red }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/chadracula.lua b/lua/base46/themes/chadracula.lua index b8c3711..98669f4 100644 --- a/lua/base46/themes/chadracula.lua +++ b/lua/base46/themes/chadracula.lua @@ -53,14 +53,8 @@ M.base_16 = { } M.polish_hl = { - - TSFuncBuiltin = { - fg = M.base_30.cyan, - }, - - TSNumber = { - fg = M.base_30.purple, - }, + TSFuncBuiltin = { fg = M.base_30.cyan }, + TSNumber = { fg = M.base_30.purple }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/chocolate.lua b/lua/base46/themes/chocolate.lua index 7ccfab9..15436fc 100644 --- a/lua/base46/themes/chocolate.lua +++ b/lua/base46/themes/chocolate.lua @@ -57,41 +57,15 @@ M.base_16 = { } M.polish_hl = { - TSField = { - fg = M.base_30.purple, - }, - - TSVariable = { - fg = M.base_16.base06, - }, - - TSModule = { - 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, - }, + TSField = { fg = M.base_30.purple }, + TSVariable = { fg = M.base_16.base06 }, + TSModule = { 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" diff --git a/lua/base46/themes/doomchad.lua b/lua/base46/themes/doomchad.lua index 33ca84d..fbebb56 100644 --- a/lua/base46/themes/doomchad.lua +++ b/lua/base46/themes/doomchad.lua @@ -53,9 +53,7 @@ M.base_16 = { } M.polish_hl = { - TSFieldKey = { - fg = M.base_30.blue - } + TSFieldKey = { fg = M.base_30.blue }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/everforest.lua b/lua/base46/themes/everforest.lua index 05ce874..19df372 100644 --- a/lua/base46/themes/everforest.lua +++ b/lua/base46/themes/everforest.lua @@ -55,21 +55,10 @@ M.base_16 = { vim.opt.bg = "dark" M.polish_hl = { - TSPunctBracket = { - fg = M.base_30.red, - }, - - TSTag = { - fg = M.base_30.orange, - }, - - TSTagDelimiter = { - fg = M.base_30.green, - }, - - TSConstructor = { - fg = "#7fbbb3", - }, + TSPunctBracket = { fg = M.base_30.red }, + TSTag = { fg = M.base_30.orange }, + TSTagDelimiter = { fg = M.base_30.green }, + TSConstructor = { fg = "#7fbbb3" }, } M = require("base46").override_theme(M, "everforest") diff --git a/lua/base46/themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua index 2b14b06..01a4480 100644 --- a/lua/base46/themes/everforest_light.lua +++ b/lua/base46/themes/everforest_light.lua @@ -27,8 +27,8 @@ M.base_30 = { teal = "#69a59d", orange = "#F7954F", cyan = "#7521e9", - statusline_bg = "#f0ead9", - lightbg = "#c9c3b2", + statusline_bg = "#ede7d6", + lightbg = "#d3cdbc", pmenu_bg = "#5f9b93", folder_bg = "#747b6e", } @@ -53,42 +53,18 @@ M.base_16 = { } M.polish_hl = { - DiffAdd = { - fg = M.base_30.green, - }, - - TSTag = { - fg = M.base_30.orange, - }, - - TSField = { - fg = M.base_16.base05, - }, - - 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, - }, + DiffAdd = { fg = M.base_30.green }, + TSTag = { fg = M.base_30.orange }, + TSField = { fg = M.base_16.base05 }, + 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 = { bg = M.base_30.one_bg }, + Pmenu = { bg = M.base_30.black2 }, + IndentBlanklineContextStart = { bg = M.base_30.black2 }, + St_pos_text = { fg = M.base_30.white }, } vim.opt.bg = "light" diff --git a/lua/base46/themes/gruvbox_light.lua b/lua/base46/themes/gruvbox_light.lua index 9b2dce3..8a4706d 100644 --- a/lua/base46/themes/gruvbox_light.lua +++ b/lua/base46/themes/gruvbox_light.lua @@ -55,10 +55,7 @@ M.base_16 = { vim.opt.bg = "light" M.polish_hl = { - TbLineThemeToggleBtn = { - fg = M.base_30.black, - bg = M.base_30.white, - }, + TbLineThemeToggleBtn = { fg = M.base_30.black, bg = M.base_30.white }, } M = require("base46").override_theme(M, "gruvbox_light") diff --git a/lua/base46/themes/kanagawa.lua b/lua/base46/themes/kanagawa.lua index 6d4bd39..766e64d 100644 --- a/lua/base46/themes/kanagawa.lua +++ b/lua/base46/themes/kanagawa.lua @@ -53,17 +53,9 @@ M.base_16 = { } M.polish_hl = { - TSInclude = { - fg = M.base_30.purple, - }, - - TSURI = { - fg = M.base_30.blue, - }, - - TSTagDelimiter = { - fg = M.base_30.red, - }, + TSInclude = { fg = M.base_30.purple }, + TSURI = { fg = M.base_30.blue }, + TSTagDelimiter = { fg = M.base_30.red }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/monekai.lua b/lua/base46/themes/monekai.lua index 5e7811d..53076c8 100644 --- a/lua/base46/themes/monekai.lua +++ b/lua/base46/themes/monekai.lua @@ -53,13 +53,10 @@ M.base_16 = { } M.polish_hl = { - TSParameter = { - fg = M.base_30.blue, - }, - TSFieldKey = { - fg = M.base_30.red, - }, + TSParameter = { fg = M.base_30.blue }, + TSFieldKey = { fg = M.base_30.red }, } + vim.opt.bg = "dark" M = require("base46").override_theme(M, "monekai") diff --git a/lua/base46/themes/mountain.lua b/lua/base46/themes/mountain.lua index 75fb253..8949821 100644 --- a/lua/base46/themes/mountain.lua +++ b/lua/base46/themes/mountain.lua @@ -53,10 +53,7 @@ M.base_16 = { } M.polish_hl = { - TSVariable = { - fg = M.base_16.base05, - }, - + TSVariable = { fg = M.base_16.base05 }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/nightowl.lua b/lua/base46/themes/nightowl.lua index 469ac93..97d3cd9 100644 --- a/lua/base46/themes/nightowl.lua +++ b/lua/base46/themes/nightowl.lua @@ -53,21 +53,10 @@ M.base_16 = { } M.polish_hl = { - TSParameter = { - fg = M.base_30.orange, - }, - - TSKeywordReturn = { - fg = M.base_30.cyan, - }, - - TSConditional = { - fg = M.base_30.cyan, - }, - - PmenuSel = { - bg = M.base_30.blue, - }, + TSParameter = { fg = M.base_30.orange }, + TSKeywordReturn = { fg = M.base_30.cyan }, + TSConditional = { fg = M.base_30.cyan }, + PmenuSel = { bg = M.base_30.blue }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/nord.lua b/lua/base46/themes/nord.lua index 99af1f1..281ab6a 100644 --- a/lua/base46/themes/nord.lua +++ b/lua/base46/themes/nord.lua @@ -53,13 +53,8 @@ M.base_16 = { } M.polish_hl = { - TSPunctBracket = { - fg = M.base_30.white, - }, - - TSPunctDelimiter = { - fg = M.base_30.white, - }, + TSPunctBracket = { fg = M.base_30.white }, + TSPunctDelimiter = { fg = M.base_30.white }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/one_light.lua b/lua/base46/themes/one_light.lua index 8b423bf..c5820da 100644 --- a/lua/base46/themes/one_light.lua +++ b/lua/base46/themes/one_light.lua @@ -55,43 +55,16 @@ M.base_16 = { vim.opt.bg = "light" M.polish_hl = { - WhichKeyDesc = { - 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, - }, - - 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, - }, + 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 }, + WhichKeyDesc = { fg = M.base_30.white }, + Pmenu = { bg = M.base_30.black2 }, + St_pos_text = { fg = M.base_30.white }, } M = require("base46").override_theme(M, "one_light") diff --git a/lua/base46/themes/onedark.lua b/lua/base46/themes/onedark.lua index 4ef234b..accb29d 100644 --- a/lua/base46/themes/onedark.lua +++ b/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", diff --git a/lua/base46/themes/onenord_light.lua b/lua/base46/themes/onenord_light.lua index b02b101..516b2a9 100644 --- a/lua/base46/themes/onenord_light.lua +++ b/lua/base46/themes/onenord_light.lua @@ -53,38 +53,15 @@ M.base_16 = { } M.polish_hl = { - WhichKeyDesc = { - 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, - }, - - 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, - }, + WhichKeyDesc = { 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 }, + 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 }, } M = require("base46").override_theme(M, "onenord_light") diff --git a/lua/base46/themes/palenight.lua b/lua/base46/themes/palenight.lua index bf365c5..7d4d149 100644 --- a/lua/base46/themes/palenight.lua +++ b/lua/base46/themes/palenight.lua @@ -53,12 +53,8 @@ M.base_16 = { } M.polish_hl = { - TSInclude = { - fg = M.base_30.purple, - }, - TSFieldKey = { - fg = M.base_30.orange, - }, + TSInclude = { fg = M.base_30.purple }, + TSFieldKey = { fg = M.base_30.orange }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/radium.lua b/lua/base46/themes/radium.lua index 9e07301..2e868f4 100644 --- a/lua/base46/themes/radium.lua +++ b/lua/base46/themes/radium.lua @@ -53,13 +53,8 @@ M.base_16 = { } M.polish_hl = { - TSPunctBracket = { - fg = M.base_16.base07, - }, - - TSParenthesis = { - link = "TSPunctBracket" - }, + TSPunctBracket = { fg = M.base_16.base07 }, + TSParenthesis = { link = "TSPunctBracket" }, } vim.opt.bg = "dark" diff --git a/lua/base46/themes/tomorrow_night.lua b/lua/base46/themes/tomorrow_night.lua index 41b8a32..5d0a78e 100644 --- a/lua/base46/themes/tomorrow_night.lua +++ b/lua/base46/themes/tomorrow_night.lua @@ -55,10 +55,7 @@ M.base_16 = { vim.opt.bg = "dark" M.polish_hl = { - PmenuSel = { - fg = M.base_30.black, - bg = M.base_30.red, - }, + PmenuSel = { fg = M.base_30.black, bg = M.base_30.red }, } M = require("base46").override_theme(M, "tomorrow_night") diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua index 201649f..eca1ef2 100644 --- a/lua/base46/themes/vscode_dark.lua +++ b/lua/base46/themes/vscode_dark.lua @@ -55,33 +55,13 @@ M.base_16 = { } M.polish_hl = { - TSParameter = { - fg = M.base_30.blue, - }, - - TSKeyword = { - fg = M.base_30.blue, - }, - - 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, - }, + TSParameter = { fg = M.base_30.blue }, + TSKeyword = { fg = M.base_30.blue }, + 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"