refactor polish_hl

this can be used to add new highlight groups now!
v2.5
siduck 2 years ago committed by Sidhanth Rathod
parent 5d9c9db02e
commit 6852de99a7

@ -43,26 +43,12 @@ M.turn_str_to_color = function(tb)
return copy return copy
end end
M.extend_default_hl = function(highlights) M.extend_default_hl = function(highlights, integration_name)
local polish_hl = M.get_theme_tb "polish_hl" local polish_hl = M.get_theme_tb "polish_hl"
local add_hl = M.get_theme_tb "add_hl"
-- polish themes -- polish themes
if polish_hl then if polish_hl[integration_name] then
for key, value in pairs(polish_hl) do highlights = M.merge_tb(highlights, polish_hl[integration_name])
if highlights[key] then
highlights[key] = M.merge_tb(highlights[key], value)
end
end
end
-- add new hl
if add_hl then
for key, value in pairs(add_hl) do
if not highlights[key] and type(value) == "table" then
highlights[key] = value
end
end
end end
-- transparency -- transparency
@ -85,12 +71,13 @@ M.extend_default_hl = function(highlights)
end end
end end
end end
return highlights
end end
M.load_integrationTB = function(group) M.load_integrationTB = function(name)
group = require("base46.integrations." .. group) local highlights = require("base46.integrations." .. name)
M.extend_default_hl(group) return M.extend_default_hl(highlights, name)
return group
end end
-- convert table into string -- convert table into string

@ -42,7 +42,7 @@ local item_kinds = {
CmpItemKindTypeParameter = { fg = base16.base08 }, CmpItemKindTypeParameter = { fg = base16.base08 },
CmpItemKindCopilot = { fg = colors.green }, CmpItemKindCopilot = { fg = colors.green },
CmpItemKindCodeium = { fg = colors.vibrant_green }, CmpItemKindCodeium = { fg = colors.vibrant_green },
CmpItemKindTabNine = {fg = colors.baby_pink }, CmpItemKindTabNine = { fg = colors.baby_pink },
} }
local cmp_ui = require("nvconfig").ui.cmp local cmp_ui = require("nvconfig").ui.cmp

@ -28,10 +28,10 @@ return {
DevIconxz = { fg = colors.sun }, DevIconxz = { fg = colors.sun },
DevIconzip = { fg = colors.sun }, DevIconzip = { fg = colors.sun },
DevIconZig = { fg = colors.orange }, DevIconZig = { fg = colors.orange },
DevIconMd = {fg = colors.blue}, DevIconMd = { fg = colors.blue },
DevIconTSX = {fg = colors.blue}, DevIconTSX = { fg = colors.blue },
DevIconJSX = {fg = colors.blue}, DevIconJSX = { fg = colors.blue },
DevIconSvelte = {fg = colors.red}, DevIconSvelte = { fg = colors.red },
DevIconJava = {fg = colors.orange}, DevIconJava = { fg = colors.orange },
DevIconDart = {fg = colors.cyan} DevIconDart = { fg = colors.cyan },
} }

@ -10,5 +10,5 @@ return {
nvUpdaterProgressFAIL = { fg = colors.red, bg = colors.one_bg2 }, nvUpdaterProgressFAIL = { fg = colors.red, bg = colors.one_bg2 },
nvUpdaterCommits = { fg = colors.green }, nvUpdaterCommits = { fg = colors.green },
nvUpdaterFAIL = { fg = colors.red}, nvUpdaterFAIL = { fg = colors.red },
} }

@ -1,120 +1,33 @@
local theme = require("base46").get_theme_tb "base_16" local theme = require("base46").get_theme_tb "base_16"
local syntax = { local syntax = {
Boolean = { Boolean = { fg = theme.base09 },
fg = theme.base09, Character = { fg = theme.base08 },
}, Conditional = { fg = theme.base0E },
Constant = { fg = theme.base08 },
Character = { Define = { fg = theme.base0E, sp = "none" },
fg = theme.base08, Delimiter = { fg = theme.base0F },
}, Float = { fg = theme.base09 },
Variable = { fg = theme.base05 },
Conditional = { Function = { fg = theme.base0D },
fg = theme.base0E, Identifier = { fg = theme.base08, sp = "none" },
}, Include = { fg = theme.base0D },
Keyword = { fg = theme.base0E },
Constant = { Label = { fg = theme.base0A },
fg = theme.base08, Number = { fg = theme.base09 },
}, Operator = { fg = theme.base05, sp = "none" },
PreProc = { fg = theme.base0A },
Define = { Repeat = { fg = theme.base0A },
fg = theme.base0E, Special = { fg = theme.base0C },
sp = "none", SpecialChar = { fg = theme.base0F },
}, Statement = { fg = theme.base08 },
StorageClass = { fg = theme.base0A },
Delimiter = { String = { fg = theme.base0B },
fg = theme.base0F, Structure = { fg = theme.base0E },
}, Tag = { fg = theme.base0A },
Todo = { fg = theme.base0A, bg = theme.base01 },
Float = { Type = { fg = theme.base0A, sp = "none" },
fg = theme.base09, Typedef = { fg = theme.base0A },
},
Variable = {
fg = theme.base05,
},
Function = {
fg = theme.base0D,
},
Identifier = {
fg = theme.base08,
sp = "none",
},
Include = {
fg = theme.base0D,
},
Keyword = {
fg = theme.base0E,
},
Label = {
fg = theme.base0A,
},
Number = {
fg = theme.base09,
},
Operator = {
fg = theme.base05,
sp = "none",
},
PreProc = {
fg = theme.base0A,
},
Repeat = {
fg = theme.base0A,
},
Special = {
fg = theme.base0C,
},
SpecialChar = {
fg = theme.base0F,
},
Statement = {
fg = theme.base08,
},
StorageClass = {
fg = theme.base0A,
},
String = {
fg = theme.base0B,
},
Structure = {
fg = theme.base0E,
},
Tag = {
fg = theme.base0A,
},
Todo = {
fg = theme.base0A,
bg = theme.base01,
},
Type = {
fg = theme.base0A,
sp = "none",
},
Typedef = {
fg = theme.base0A,
},
} }
local merge_tb = require("base46").merge_tb return syntax
return merge_tb(syntax, require("base46").load_integrationTB "treesitter")

@ -85,7 +85,7 @@ local hlgroups_glassy = {
"TbLineBufOnClose", "TbLineBufOnClose",
"TbLineBufOffClose", "TbLineBufOffClose",
"TbLineBufOnModified", "TbLineBufOnModified",
"TbLineBufOffModified" "TbLineBufOffModified",
} }
if config.transparency then if config.transparency then

@ -1,222 +1,59 @@
local theme = require("base46").get_theme_tb "base_16" local theme = require("base46").get_theme_tb "base_16"
local base30 = require("base46").get_theme_tb "base_30"
return { return {
-- `@annotation` is not one of the default capture group, should we keep it ["@annotation"] = { fg = theme.base0F },
["@annotation"] = { ["@attribute"] = { fg = theme.base0A },
fg = theme.base0F, ["@character"] = { fg = theme.base08 },
}, ["@constructor"] = { fg = theme.base0C },
["@constant"] = { fg = theme.base08 },
["@attribute"] = { ["@constant.builtin"] = { fg = theme.base09 },
fg = theme.base0A, ["@constant.macro"] = { fg = theme.base08 },
}, ["@error"] = { fg = theme.base08 },
["@exception"] = { fg = theme.base08 },
["@character"] = { ["@float"] = { fg = theme.base09 },
fg = theme.base08, ["@keyword"] = { fg = theme.base0E },
}, ["@keyword.function"] = { fg = theme.base0E },
["@keyword.return"] = { fg = theme.base0E },
["@constructor"] = { ["@function"] = { fg = theme.base0D },
fg = theme.base0C, ["@function.builtin"] = { fg = theme.base0D },
}, ["@function.macro"] = { fg = theme.base08 },
["@function.call"] = { fg = theme.base0D },
["@constant"] = { ["@operator"] = { fg = theme.base05 },
fg = theme.base08, ["@keyword.operator"] = { fg = theme.base0E },
}, ["@method"] = { fg = theme.base0D },
["@method.call"] = { fg = theme.base0D },
["@constant.builtin"] = { ["@namespace"] = { fg = theme.base08 },
fg = theme.base09, ["@none"] = { fg = theme.base05 },
}, ["@parameter"] = { fg = theme.base08 },
["@reference"] = { fg = theme.base05 },
["@constant.macro"] = { ["@punctuation.bracket"] = { fg = theme.base0F },
fg = theme.base08, ["@punctuation.delimiter"] = { fg = theme.base0F },
}, ["@punctuation.special"] = { fg = theme.base08 },
["@string"] = { fg = theme.base0B },
["@error"] = { ["@string.regex"] = { fg = theme.base0C },
fg = theme.base08, ["@string.escape"] = { fg = theme.base0C },
}, ["@string.special"] = { fg = theme.base0C },
["@symbol"] = { fg = theme.base0B },
["@exception"] = { ["@tag"] = { fg = theme.base0A },
fg = theme.base08, ["@tag.attribute"] = { fg = theme.base08 },
}, ["@tag.delimiter"] = { fg = theme.base0F },
["@text"] = { fg = theme.base05 },
["@float"] = { ["@text.strong"] = { bold = true },
fg = theme.base09, ["@text.emphasis"] = { fg = theme.base09 },
}, ["@text.strike"] = { fg = theme.base0F, strikethrough = true },
["@text.literal"] = { fg = theme.base09 },
["@keyword"] = { ["@text.uri"] = { fg = theme.base09, underline = true },
fg = theme.base0E, ["@type.builtin"] = { fg = theme.base0A },
}, ["@variable"] = { fg = theme.base05 },
["@variable.builtin"] = { fg = theme.base09 },
["@keyword.function"] = { ["@definition"] = { sp = theme.base04, underline = true },
fg = theme.base0E, ["@scope"] = { bold = true },
}, ["@field"] = { fg = theme.base08 },
["@field.key"] = { fg = theme.base08 },
["@keyword.return"] = { ["@property"] = { fg = theme.base08 },
fg = theme.base0E, ["@include"] = { link = "Include" },
}, ["@conditional"] = { fg = theme.base0E },
["@conditional.ternary"] = { fg = theme.base0E },
["@function"] = { ["@comment"] = { fg = base30.grey_fg },
fg = theme.base0D,
},
["@function.builtin"] = {
fg = theme.base0D,
},
["@function.macro"] = {
fg = theme.base08,
},
["@function.call"] = {
fg = theme.base0D,
},
["@operator"] = {
fg = theme.base05,
},
["@keyword.operator"] = {
fg = theme.base0E,
},
["@method"] = {
fg = theme.base0D,
},
["@method.call"] = {
fg = theme.base0D,
},
["@namespace"] = {
fg = theme.base08,
},
["@none"] = {
fg = theme.base05,
},
["@parameter"] = {
fg = theme.base08,
},
["@reference"] = {
fg = theme.base05,
},
["@punctuation.bracket"] = {
fg = theme.base0F,
},
["@punctuation.delimiter"] = {
fg = theme.base0F,
},
["@punctuation.special"] = {
fg = theme.base08,
},
["@string"] = {
fg = theme.base0B,
},
["@string.regex"] = {
fg = theme.base0C,
},
["@string.escape"] = {
fg = theme.base0C,
},
["@string.special"] = {
fg = theme.base0C,
},
["@symbol"] = {
fg = theme.base0B,
},
["@tag"] = {
link = "Tag",
},
["@tag.attribute"] = {
link = "@property",
},
["@tag.delimiter"] = {
fg = theme.base0F,
},
["@text"] = {
fg = theme.base05,
},
["@text.strong"] = {
bold = true,
},
["@text.emphasis"] = {
fg = theme.base09,
},
["@text.strike"] = {
fg = theme.base0F,
strikethrough = true,
},
["@text.literal"] = {
fg = theme.base09,
},
["@text.uri"] = {
fg = theme.base09,
underline = true,
},
["@type.builtin"] = {
fg = theme.base0A,
},
["@variable"] = {
fg = theme.base05,
},
["@variable.builtin"] = {
fg = theme.base09,
},
-- variable.global
["@definition"] = {
sp = theme.base04,
underline = true,
},
-- TSDefinitionUsage = {
-- sp = theme.base04,
-- underline = true,
-- },
["@scope"] = {
bold = true,
},
["@field"] = {
fg = theme.base08,
},
["@field.key"] = {
fg = theme.base08,
},
["@property"] = {
fg = theme.base08,
},
["@include"] = {
link = "Include",
},
["@conditional"] = {
link = "Conditional",
},
} }

@ -4,23 +4,23 @@ return {
TroubleCount = { fg = colors.pink }, TroubleCount = { fg = colors.pink },
TroubleCode = { fg = colors.white }, TroubleCode = { fg = colors.white },
TroubleWarning = { fg = colors.orange }, TroubleWarning = { fg = colors.orange },
TroubleSignWarning = { link = "DiagnosticWarn"}, TroubleSignWarning = { link = "DiagnosticWarn" },
TroubleTextWarning = { fg = colors.white }, TroubleTextWarning = { fg = colors.white },
TroublePreview = { fg = colors.red }, TroublePreview = { fg = colors.red },
TroubleSource = { fg = colors.cyan }, TroubleSource = { fg = colors.cyan },
TroubleSignHint = { link = "DiagnosticHint"}, TroubleSignHint = { link = "DiagnosticHint" },
TroubleTextHint = { fg = colors.white }, TroubleTextHint = { fg = colors.white },
TroubleHint = { fg = colors.orange }, TroubleHint = { fg = colors.orange },
TroubleSignOther = { link = "DiagnosticNormal"}, TroubleSignOther = { link = "DiagnosticNormal" },
TroubleSignInformation = { fg = colors.white }, TroubleSignInformation = { fg = colors.white },
TroubleTextInformation = { fg = colors.white }, TroubleTextInformation = { fg = colors.white },
TroubleInformation = { fg = colors.white }, TroubleInformation = { fg = colors.white },
TroubleError = { fg = colors.red }, TroubleError = { fg = colors.red },
TroubleTextError = { fg = colors.white }, TroubleTextError = { fg = colors.white },
TroubleSignError = { link = "DiagnosticError"}, TroubleSignError = { link = "DiagnosticError" },
TroubleText = { fg = colors.white }, TroubleText = { fg = colors.white },
TroubleFile = { fg = colors.yellow }, TroubleFile = { fg = colors.yellow },
TroubleFoldIcon = { link = "Folded"}, TroubleFoldIcon = { link = "Folded" },
TroubleNormal = { fg = colors.white }, TroubleNormal = { fg = colors.white },
TroubleLocation = { fg = colors.red }, TroubleLocation = { fg = colors.red },
TroubleIndent = { link = colors.Comment }, TroubleIndent = { link = colors.Comment },

@ -56,12 +56,14 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
luaTSField = { fg = M.base_16.base0D }, treesitter = {
["@tag.delimiter"] = { fg = M.base_30.cyan }, luaTSField = { fg = M.base_16.base0D },
["@function"] = { fg = M.base_30.orange }, ["@tag.delimiter"] = { fg = M.base_30.cyan },
["@parameter"] = { fg = M.base_16.base0F }, ["@function"] = { fg = M.base_30.orange },
["@constructor"] = { fg = M.base_16.base0A }, ["@parameter"] = { fg = M.base_16.base0F },
["@tag.attribute"] = { fg = M.base_30.orange }, ["@constructor"] = { fg = M.base_16.base0A },
["@tag.attribute"] = { fg = M.base_30.orange },
},
} }
M = require("base46").override_theme(M, "ayu_dark") M = require("base46").override_theme(M, "ayu_dark")

@ -56,12 +56,14 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
luaTSField = { fg = M.base_16.base0E }, treesitter = {
PmenuSel = { fg = M.base_30.white, bg = M.base_30.pmenu_bg }, luaTSField = { fg = M.base_16.base0E },
["@tag.delimiter"] = { fg = M.base_30.base0D }, PmenuSel = { fg = M.base_30.white, bg = M.base_30.pmenu_bg },
["@parameter"] = { fg = M.base_16.base09 }, ["@tag.delimiter"] = { fg = M.base_30.base0D },
["@constructor"] = { fg = M.base_16.base0C }, ["@parameter"] = { fg = M.base_16.base09 },
["@tag.attribute"] = { fg = M.base_30.base0F }, ["@constructor"] = { fg = M.base_16.base0C },
["@tag.attribute"] = { fg = M.base_30.base0F },
},
} }
M = require("base46").override_theme(M, "ayu_light") M = require("base46").override_theme(M, "ayu_light")

@ -58,17 +58,10 @@ M.base_16 = {
M.type = "dark" M.type = "dark"
M.polish_hl = { M.polish_hl = {
Conditional = { treesitter = {
fg = M.base_30.yellow, ["@parameter"] = { fg = M.base_30.pink },
["@attribute"] = { fg = M.base_30.purple },
}, },
["@parameter"] = {
fg = M.base_30.pink,
},
["@attribute"] = {
fg = M.base_30.purple
}
} }
M = require("base46").override_theme(M, "bearded-arc") M = require("base46").override_theme(M, "bearded-arc")

@ -56,16 +56,22 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
WhichKeyDesc = { fg = M.base_30.white }, whichkey = {
WhichKey = { fg = M.base_30.white }, WhichKeyDesc = { fg = M.base_30.white },
WhichKey = { fg = M.base_30.white },
},
TbLineThemeToggleBtn = { tbline = {
fg = M.base_30.black, TbLineThemeToggleBtn = {
bg = M.base_30.white, fg = M.base_30.black,
bg = M.base_30.white,
},
}, },
IndentBlanklineContextStart = { bg = M.base_30.black2 }, -- IndentBlanklineContextStart = { bg = M.base_30.black2 },
St_pos_text = { fg = M.base_30.white }, statusline = {
St_pos_text = { fg = M.base_30.white },
},
} }
M.type = "light" M.type = "light"

@ -54,9 +54,11 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@variable"] = { fg = M.base_30.lavender }, treesitter = {
["@property"] = { fg = M.base_30.teal }, ["@variable"] = { fg = M.base_30.lavender },
["@variable.builtin"] = { fg = M.base_30.red }, ["@property"] = { fg = M.base_30.teal },
["@variable.builtin"] = { fg = M.base_30.red },
},
} }
M.type = "dark" M.type = "dark"

@ -1,5 +1,5 @@
-- Credits to original theme https://github.com/dracula/vim -- Credits to original theme https://github.com/dracula/vim
-- This is a modified version -- This is a modified version
local M = {} local M = {}
@ -56,8 +56,10 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@function.builtin"] = { fg = M.base_30.cyan }, treesiter = {
["@number"] = { fg = M.base_30.purple }, ["@function.builtin"] = { fg = M.base_30.cyan },
["@number"] = { fg = M.base_30.purple },
},
} }
M.type = "dark" M.type = "dark"

@ -57,15 +57,20 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@field"] = { fg = M.base_30.purple }, syntax = {
["@variable"] = { fg = M.base_16.base06 }, Operator = { fg = M.base_30.blue },
["@module"] = { fg = M.base_30.beige }, },
Operator = { fg = M.base_30.blue },
["@attribute"] = { fg = M.base_30.cyan }, treesitter = {
["@punctuation.bracket"] = { fg = M.base_16.base06 }, ["@field"] = { fg = M.base_30.purple },
["@parenthesis"] = { link = "@punctuation.bracket" }, ["@variable"] = { fg = M.base_16.base06 },
["@parameter"] = { fg = M.base_30.green }, ["@module"] = { fg = M.base_30.beige },
["@function.builtin"] = { fg = M.base_30.yellow }, ["@attribute"] = { fg = M.base_30.cyan },
["@punctuation.bracket"] = { fg = M.base_16.base06 },
["@parenthesis"] = { link = "@punctuation.bracket" },
["@parameter"] = { fg = M.base_30.green },
["@function.builtin"] = { fg = M.base_30.yellow },
},
} }
M.type = "dark" M.type = "dark"

@ -1,5 +1,5 @@
-- Credits to original theme https://github.com/michael-ball/base16-horizon-scheme -- Credits to original theme https://github.com/michael-ball/base16-horizon-scheme
-- This is a modified version -- This is a modified version
local M = {} local M = {}
@ -57,11 +57,16 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
Include = { fg = M.base_16.base0E, bold = true }, syntax = {
["@property"] = { fg = M.base_16.base0E }, Include = { fg = M.base_16.base0E, bold = true },
["@tag.delimiter"] = { fg = M.base_16.base05 }, },
["@punctuation.bracket"] = { fg = M.base_30.yellow },
["@punctuation.delimiter"] = { fg = M.base_30.yellow }, treesitter = {
["@property"] = { fg = M.base_16.base0E },
["@tag.delimiter"] = { fg = M.base_16.base05 },
["@punctuation.bracket"] = { fg = M.base_30.yellow },
["@punctuation.delimiter"] = { fg = M.base_30.yellow },
},
} }
M.type = "dark" M.type = "dark"

@ -56,8 +56,8 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@constant"] = { treesitter = {
fg = M.base_30.yellow, ["@constant"] = { fg = M.base_30.yellow },
}, },
} }

@ -56,8 +56,10 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@field"] = { fg = M.base_30.blue }, treesitter = {
["@punctuation.bracket"] = { fg = M.base_30.yellow }, ["@field"] = { fg = M.base_30.blue },
["@punctuation.bracket"] = { fg = M.base_30.yellow },
},
} }
M.type = "dark" M.type = "dark"

@ -55,12 +55,13 @@ M.base_16 = {
base0F = "#d699b6", base0F = "#d699b6",
} }
M.type = "dark" M.type = "dark"
M.polish_hl = { M.polish_hl = {
["@tag"] = { fg = M.base_30.orange }, treesitter = {
["@tag.delimiter"] = { fg = M.base_30.green }, ["@tag"] = { fg = M.base_30.orange },
["@tag.delimiter"] = { fg = M.base_30.green },
},
} }
M = require("base46").override_theme(M, "everforest") M = require("base46").override_theme(M, "everforest")

@ -56,18 +56,38 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
DiffAdd = { fg = M.base_30.green }, git = {
WhichKeyDesc = { fg = M.base_30.white }, DiffAdd = { fg = M.base_30.green },
WhichKey = { fg = M.base_30.white }, },
NvimTreeFolderName = { fg = "#4e565c" },
TbLineThemeToggleBtn = { bg = M.base_30.one_bg }, whichkey = {
Pmenu = { bg = M.base_30.black2 }, WhichKeyDesc = { fg = M.base_30.white },
IndentBlanklineContextStart = { bg = M.base_30.black2 }, WhichKey = { fg = M.base_30.white },
St_pos_text = { fg = M.base_30.white }, },
["@tag"] = { fg = M.base_30.orange },
["@field"] = { fg = M.base_16.base05 }, nvimtree = {
["@include"] = { fg = M.base_16.base08 }, NvimTreeFolderName = { fg = "#4e565c" },
["@constructor"] = { fg = M.base_30.blue }, },
tbline = {
TbLineThemeToggleBtn = { bg = M.base_30.one_bg },
},
defaults = {
Pmenu = { bg = M.base_30.black2 },
},
-- IndentBlanklineContextStart = { bg = M.base_30.black2 },
statusline = {
St_pos_text = { fg = M.base_30.white },
},
treesitter = {
["@tag"] = { fg = M.base_30.orange },
["@field"] = { fg = M.base_16.base05 },
["@include"] = { fg = M.base_16.base08 },
["@constructor"] = { fg = M.base_30.blue },
},
} }
M.type = "light" M.type = "light"

@ -58,12 +58,17 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
Statement = { fg = M.base_30.purple }, syntax = {
Type = { fg = M.base_30.white2 }, Statement = { fg = M.base_30.purple },
Include = { fg = M.base_30.tan }, Type = { fg = M.base_30.white2 },
Keyword = { fg = M.base_16.base0D }, Include = { fg = M.base_30.tan },
Operator = { fg = M.base_30.red }, Keyword = { fg = M.base_16.base0D },
["@keyword"] = { fg = M.base_16.base0D }, Operator = { fg = M.base_30.red },
},
treesitter = {
["@keyword"] = { fg = M.base_16.base0D },
},
} }
M.type = "dark" M.type = "dark"

@ -53,8 +53,10 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@variable"] = { fg = M.base_30.orange }, treesitter = {
["@parameter"] = { fg = M.base_30.white }, ["@variable"] = { fg = M.base_30.orange },
["@parameter"] = { fg = M.base_30.white },
},
} }
M.type = "dark" M.type = "dark"

@ -58,25 +58,12 @@ M.base_16 = {
M.type = "dark" M.type = "dark"
M.polish_hl = { M.polish_hl = {
["@punctuation.bracket"] = { treesitter = {
fg = M.base_30.orange, ["@punctuation.bracket"] = { fg = M.base_30.orange },
}, ["@string"] = { fg = M.base_30.white },
["@field.key"] = { fg = M.base_30.white },
["@string"] = { ["@constructor"] = { fg = M.base_30.vibrant_green },
fg = M.base_30.white, ["@tag.attribute"] = { link = "@method" },
},
["@field.key"] = {
fg = M.base_30.white,
},
["@constructor"] = {
fg = M.base_30.vibrant_green,
bold = true,
},
["@tag.attribute"] = {
link = "@method",
}, },
} }

@ -19,7 +19,7 @@ M.base_30 = {
baby_pink = "#ea4aaa", baby_pink = "#ea4aaa",
pink = "#b93a86", pink = "#b93a86",
line = "#eaecee", -- for lines like vertsplit line = "#eaecee", -- for lines like vertsplit
green = "#18654B", green = "#18654B",
vibrant_green = "#28a745", vibrant_green = "#28a745",
nord_blue = "#0366d6", -- Mode indicator nord_blue = "#0366d6", -- Mode indicator
blue = "#0D7FDD", blue = "#0D7FDD",
@ -58,29 +58,17 @@ M.base_16 = {
M.type = "light" M.type = "light"
M.polish_hl = { M.polish_hl = {
["@punctuation.bracket"] = { treesitter = {
fg = M.base_30.blue, ["@punctuation.bracket"] = { fg = M.base_30.blue },
["@field.key"] = { fg = M.base_30.white },
["@constructor"] = { fg = M.base_30.vibrant_green },
["@operator"] = { fg = M.base_30.orange },
}, },
["@field.key"] = { syntax = {
fg = M.base_30.white, Constant = { fg = M.base_16.base07 },
Tag = { fg = M.base_30.vibrant_green },
}, },
Constant = {
fg = M.base_16.base07,
},
["@constructor"] = {
fg = M.base_30.vibrant_green,
},
Tag = {
fg = M.base_30.vibrant_green,
},
["@operator"] = {
fg = M.base_30.orange
}
} }
M = require("base46").override_theme(M, "github_light") M = require("base46").override_theme(M, "github_light")

@ -60,12 +60,12 @@ M.type = "dark"
M = require("base46").override_theme(M, "gruvbox") M = require("base46").override_theme(M, "gruvbox")
M.polish_hl = { M.polish_hl = {
Operator = { syntax = {
fg = M.base_30.nord_blue, Operator = { fg = M.base_30.nord_blue },
}, },
["@operator"] = { treesitter = {
fg = M.base_30.nord_blue, ["@operator"] = { fg = M.base_30.nord_blue },
}, },
} }

@ -58,7 +58,9 @@ M.base_16 = {
M.type = "light" M.type = "light"
M.polish_hl = { M.polish_hl = {
TbLineThemeToggleBtn = { fg = M.base_30.black, bg = M.base_30.white }, tbline = {
TbLineThemeToggleBtn = { fg = M.base_30.black, bg = M.base_30.white },
},
} }
M = require("base46").override_theme(M, "gruvbox_light") M = require("base46").override_theme(M, "gruvbox_light")

@ -56,24 +56,17 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@include"] = { fg = M.base_30.purple }, treesitter = {
["@uri"] = { fg = M.base_30.blue }, ["@include"] = { fg = M.base_30.purple },
["@tag.delimiter"] = { fg = M.base_30.red }, ["@uri"] = { fg = M.base_30.blue },
["@tag.delimiter"] = { fg = M.base_30.red },
["@field.key"] = { ["@field.key"] = { fg = M.base_30.white },
fg = M.base_30.white, ["@punctuation.bracket"] = { fg = M.base_30.pmenu_bg },
}, ["@punctuation.delimiter"] = { fg = M.base_30.white },
["@punctuation.bracket"] = {
fg = M.base_30.pmenu_bg,
},
["@punctuation.delimiter"] = {
fg = M.base_30.white,
}, },
Number = { syntax = {
fg = M.base_30.baby_pink, Number = { fg = M.base_30.baby_pink },
}, },
} }

@ -59,24 +59,19 @@ M.base_16 = {
M.type = "dark" M.type = "dark"
M.polish_hl = { M.polish_hl = {
["@field"] = { fg = M.base_30.white }, treesitter = {
["@field.key"] = { fg = M.base_30.white }, ["@field"] = { fg = M.base_30.white },
["@field.key"] = { fg = M.base_30.white },
["@function.macro"] = { ["@function.macro"] = {
fg = M.base_30.vibrant_green, fg = M.base_30.vibrant_green,
}, },
Include = {
fg = M.base_30.vibrant_green,
}, },
Operator = { syntax = {
fg = M.base_30.firered, Include = { fg = M.base_30.vibrant_green },
Operator = { fg = M.base_30.firered },
Boolean = { fg = M.base_30.purple },
}, },
Boolean = {
fg = M.base_30.purple
}
} }
M = require("base46").override_theme(M, "melange") M = require("base46").override_theme(M, "melange")

@ -56,13 +56,18 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["parameter"] = { fg = M.base_30.blue }, treesitter = {
["@field.key"] = { fg = M.base_30.white }, ["parameter"] = { fg = M.base_30.blue },
["@string"] = { fg = M.base_30.sun }, ["@field.key"] = { fg = M.base_30.white },
["@boolean"] = { fg = M.base_16.base09 }, ["@string"] = { fg = M.base_30.sun },
["@punctuation.bracket"] = { fg = M.base_30.sun }, ["@boolean"] = { fg = M.base_16.base09 },
Operator = { fg = M.base_30.red }, ["@punctuation.bracket"] = { fg = M.base_30.sun },
["@operator"] = { fg = M.base_30.red }, ["@operator"] = { fg = M.base_30.red },
},
syntax = {
Operator = { fg = M.base_30.red },
},
} }
M.type = "dark" M.type = "dark"

@ -56,7 +56,9 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@punctuation.bracket"] = { fg = M.base_30.red }, treesitter = {
["@punctuation.bracket"] = { fg = M.base_30.red },
},
} }
M.type = "dark" M.type = "dark"

@ -56,7 +56,9 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@variable"] = { fg = M.base_16.base05 }, treesitter = {
["@variable"] = { fg = M.base_16.base05 },
},
} }
M.type = "dark" M.type = "dark"

@ -56,10 +56,12 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@field.key"] = { fg = M.base_16.base05 }, treesitter = {
["@operator"] = { fg = M.base_30.dark_purple }, ["@field.key"] = { fg = M.base_16.base05 },
["@keyword"] = { fg = M.base_30.teal }, ["@operator"] = { fg = M.base_30.dark_purple },
["@parameter"] = { fg = M.base_30.teal }, ["@keyword"] = { fg = M.base_30.teal },
["@parameter"] = { fg = M.base_30.teal },
},
} }
M.type = "dark" M.type = "dark"

@ -56,10 +56,11 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@parameter"] = { fg = M.base_30.orange }, treesitter = {
["@keyword.return"] = { fg = M.base_30.cyan }, ["@parameter"] = { fg = M.base_30.orange },
["@conditional"] = { fg = M.base_30.cyan }, ["@keyword.return"] = { fg = M.base_30.cyan },
PmenuSel = { bg = M.base_30.blue }, ["@conditional"] = { fg = M.base_30.cyan },
},
} }
M.type = "dark" M.type = "dark"

@ -56,8 +56,10 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@punctuation.bracket"] = { fg = M.base_30.white }, treesitter = {
["@punctuation.delimiter"] = { fg = M.base_30.white }, ["@punctuation.bracket"] = { fg = M.base_30.white },
["@punctuation.delimiter"] = { fg = M.base_30.white },
},
} }
M.type = "dark" M.type = "dark"

@ -60,12 +60,19 @@ M.type = "light"
M = require("base46").override_theme(M, "oceanic-next-light") M = require("base46").override_theme(M, "oceanic-next-light")
M.polish_hl = { M.polish_hl = {
St_NTerminalMode = { fg = M.base_30.white }, statusline = {
St_VisualMode = { bg = M.base_30.teal }, St_NTerminalMode = { fg = M.base_30.white },
St_VisualModeSep = { fg = M.base_30.teal }, St_VisualMode = { bg = M.base_30.teal },
St_VisualModeSep = { fg = M.base_30.teal },
},
["@field"] = { fg = M.base_16.base0C }, treesitter = {
Constant = { fg = M.base_16.base09 }, ["@field"] = { fg = M.base_16.base0C },
},
syntax = {
Constant = { fg = M.base_16.base09 },
},
} }
return M return M

@ -57,11 +57,12 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@parameter"] = { treesitter = {
fg = M.base_16.base0A, ["@parameter"] = { fg = M.base_16.base0A },
}, },
Constant = {
fg = M.base_16.base09, syntax = {
Constant = { fg = M.base_16.base09 },
}, },
} }

@ -58,15 +58,30 @@ M.base_16 = {
M.type = "light" M.type = "light"
M.polish_hl = { M.polish_hl = {
TelescopePromptPrefix = { fg = M.base_30.white }, telescope = {
TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white }, TelescopePromptPrefix = { fg = M.base_30.white },
["@punctuation.bracket"] = { fg = M.base_30.nord_blue }, 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 }, treesitter = {
WhichKeyDesc = { fg = M.base_30.white }, ["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
Pmenu = { bg = M.base_30.black2 }, },
St_pos_text = { fg = M.base_30.white },
defaults = {
FloatBorder = { fg = M.base_16.base05 },
Pmenu = { bg = M.base_30.black2 },
},
git = {
DiffAdd = { fg = M.base_16.base05 },
},
tbline = {
TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 },
},
whichkey = { WhichKeyDesc = { fg = M.base_30.white } },
statusline = { St_pos_text = { fg = M.base_30.white } },
} }
M = require("base46").override_theme(M, "one_light") M = require("base46").override_theme(M, "one_light")

@ -53,14 +53,29 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
WhichKeyDesc = { fg = M.base_30.white }, whichkey = {
WhichKey = { fg = M.base_30.white }, WhichKeyDesc = { fg = M.base_30.white },
TelescopePromptPrefix = { fg = M.base_30.white }, WhichKey = { fg = M.base_30.white },
TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white }, },
["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
FloatBorder = { fg = M.base_16.base05 }, telescope = {
DiffAdd = { fg = M.base_16.base05 }, TelescopePromptPrefix = { 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 },
},
treesitter = {
["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
},
defaults = { FloatBorder = { fg = M.base_16.base05 } },
statusline = {
St_pos_text = { fg = M.base_30.white },
},
git = {
DiffAdd = { fg = M.base_16.base05 },
},
} }
M = require("base46").override_theme(M, "onenord_light") M = require("base46").override_theme(M, "onenord_light")

@ -57,12 +57,9 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
Conditional = { syntax = {
fg = M.base_30.nord_blue, Conditional = { fg = M.base_30.nord_blue },
}, Tag = { fg = M.base_30.white },
Tag = {
fg = M.base_30.white,
}, },
} }

@ -56,8 +56,10 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@include"] = { fg = M.base_30.purple }, treesitter = {
["@field.key"] = { fg = M.base_30.orange }, ["@include"] = { fg = M.base_30.purple },
["@field.key"] = { fg = M.base_30.orange },
},
} }
M.type = "dark" M.type = "dark"

@ -56,36 +56,18 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@field.key"] = { treesitter = {
fg = M.base_30.red, ["@field.key"] = { fg = M.base_30.red },
["@punctuation.bracket"] = { fg = M.base_16.base08 },
["@constructor"] = { fg = M.base_30.orange },
["@parameter"] = { fg = M.base_30.orange },
["@tag.delimiter"] = { fg = M.base_16.base08 },
["@tag.attribute"] = { link = "@annotation" },
}, },
Constant = { syntax = {
fg = M.base_30.red, Operator = { fg = M.base_30.cyan },
}, Constant = { fg = M.base_30.red },
["@punctuation.bracket"] = {
fg = M.base_16.base08,
},
["@constructor"] = {
fg = M.base_30.orange,
},
["@parameter"] = {
fg = M.base_30.orange,
},
Operator = {
fg = M.base_30.cyan,
},
["@tag.delimiter"] = {
fg = M.base_16.base08,
},
["@tag.attribute"] = {
link = "@annotation",
}, },
} }

@ -57,28 +57,16 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@function.builtin"] = { treesitter = {
fg = M.base_30.teal, ["@function.builtin"] = { fg = M.base_30.teal },
["@field.key"] = { fg = M.base_30.red },
["@punctuation.bracket"] = { fg = M.base_30.coal },
["@field"] = { fg = M.base_30.coal },
}, },
["@field.key"] = { syntax = {
fg = M.base_30.red, Constant = { fg = M.base_30.red },
}, Include = { fg = M.base_30.dark_purple },
Constant = {
fg = M.base_30.red,
},
["@punctuation.bracket"] = {
fg = M.base_30.coal,
},
["@field"] = {
fg = M.base_30.coal,
},
Include = {
fg = M.base_30.dark_purple,
}, },
} }

@ -1,62 +0,0 @@
-- Credits to https://github.com/kyoz/purify for existing
-- this is a modified version of it
local M = {}
M.base_30 = {
white = "#FAFAFA",
darker_black = '#121b24',
black = "#151F29", -- nvim bg
black2 = "#1b2835",
one_bg = "#213141",
one_bg2 = "#293c4f",
one_bg3 = "#334c64",
grey = "#36506a",
grey_fg = "#3e5b79",
grey_fg2 = "#47698b",
light_grey = "#4c7094",
red = "#FF6059",
baby_pink = "#FF88D5",
pink = "#FF79C6",
line = "#2A3441",
green = "#5FFF87",
vibrant_green = "#6AD4D6",
blue = "#5FAFFF",
nord_blue = "#52a2f2",
yellow = "#FFFF87",
sun = "#FFFF8F",
purple = "#AF87FF",
dark_purple = "#A070FF",
teal = "#5CC6C8",
orange = "#FF875F",
cyan = "#69C3FF",
statusline_bg = "#202A37",
lightbg = "#313B48",
pmenu_bg = "#5FAFFF",
folder_bg = "#5FAFFF",
}
M.base_16 = {
base00 = "#151F29",
base01 = "#252F3C",
base02 = "#313B48",
base03 = "#3D4754",
base04 = "#565C64",
base05 = "#EBEBEB",
base06 = "#F5F5F5",
base07 = "#FAFAFA",
base08 = "#FF79C6",
base09 = "#FF875F",
base0A = "#FFFF87",
base0B = "#5FFF87",
base0C = "#69C3FF",
base0D = "#5FAFFF",
base0E = "#AF87FF",
base0F = "#FF6059",
}
M.type = "dark"
M = require("base46").override_theme(M, "purify")
return M

@ -56,8 +56,10 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@punctuation.bracket"] = { fg = M.base_16.base07 }, treesitter = {
["@parenthesis"] = { link = "@punctuation.bracket" }, ["@punctuation.bracket"] = { fg = M.base_16.base07 },
["@parenthesis"] = { link = "@punctuation.bracket" },
},
} }
M.type = "dark" M.type = "dark"

@ -56,12 +56,14 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@variable"] = { fg = M.base_16.base05 }, treesitter = {
["@punctuation.bracket"] = { fg = M.base_30.purple }, ["@variable"] = { fg = M.base_16.base05 },
["@method.call"] = { fg = M.base_30.red }, ["@punctuation.bracket"] = { fg = M.base_30.purple },
["@function.call"] = { fg = M.base_30.blue }, ["@method.call"] = { fg = M.base_30.red },
["@constant"] = { fg = M.base_30.orange }, ["@function.call"] = { fg = M.base_30.blue },
["@parameter"] = { fg = M.base_30.orange }, ["@constant"] = { fg = M.base_30.orange },
["@parameter"] = { fg = M.base_30.orange },
},
} }
M.type = "dark" M.type = "dark"

@ -58,7 +58,9 @@ M.base_16 = {
M.type = "dark" M.type = "dark"
M.polish_hl = { M.polish_hl = {
["@function.builtin"] = { fg = M.base_30.yellow }, treesitter = {
["@function.builtin"] = { fg = M.base_30.yellow },
},
-- ["@punctuation.bracket"] = { fg = M.base_30.yellow }, -- ["@punctuation.bracket"] = { fg = M.base_30.yellow },
} }

@ -58,44 +58,21 @@ M.base_16 = {
M.type = "dark" M.type = "dark"
M.polish_hl = { M.polish_hl = {
Constant = {
fg = M.base_30.orange,
},
["@constructor"] = {
fg = M.base_30.cyan,
},
["@keyword"] = {
fg = M.base_30.red,
},
["@method.call"] = {
fg = M.base_30.cyan,
},
["@function.call"] = {
fg = M.base_30.cyan,
},
["@function.builtin"] = {
fg = M.base_30.orange,
},
Conditional = {
fg = M.base_30.baby_pink,
},
Repeat = {
fg = M.base_30.baby_pink,
},
Type = { treesitter = {
fg = M.base_30.baby_pink, ["@constructor"] = { fg = M.base_30.cyan },
["@keyword"] = { fg = M.base_30.red },
["@method.call"] = { fg = M.base_30.cyan },
["@function.call"] = { fg = M.base_30.cyan },
["@function.builtin"] = { fg = M.base_30.orange },
}, },
Operator = { syntax = {
fg = M.base_30.baby_pink, Constant = { fg = M.base_30.orange },
Conditional = { fg = M.base_30.baby_pink },
Repeat = { fg = M.base_30.baby_pink },
Type = { fg = M.base_30.baby_pink },
Operator = { fg = M.base_30.baby_pink },
}, },
} }

@ -58,12 +58,14 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@parameter"] = { fg = M.base_30.blue }, treesitter = {
["@keyword"] = { fg = M.base_30.blue }, ["@parameter"] = { fg = M.base_30.blue },
["@variable"] = { fg = M.base_30.cyan }, ["@keyword"] = { fg = M.base_30.blue },
["@field.key"] = { fg = M.base_30.green1 }, ["@variable"] = { fg = M.base_30.cyan },
["@keyword.return"] = { fg = M.base_16.base0E }, ["@field.key"] = { fg = M.base_30.green1 },
["@keyword.function"] = { fg = M.base_30.teal }, ["@keyword.return"] = { fg = M.base_16.base0E },
["@keyword.function"] = { fg = M.base_30.teal },
},
} }
M.type = "dark" M.type = "dark"

@ -56,7 +56,9 @@ M.base_16 = {
} }
M.polish_hl = { M.polish_hl = {
["@punctuation.bracket"] = { fg = M.base_30.sun }, treesitter = {
["@punctuation.bracket"] = { fg = M.base_30.sun },
},
} }
M.type = "dark" M.type = "dark"

Loading…
Cancel
Save