diff --git a/after/queries/lua/highlights.scm b/after/queries/lua/highlights.scm new file mode 100644 index 0000000..b0e4c15 --- /dev/null +++ b/after/queries/lua/highlights.scm @@ -0,0 +1,2 @@ +(field + name: (identifier) @TSFieldKey) diff --git a/lua/base46.lua b/lua/base46.lua index 6d9ea0e..b93a053 100644 --- a/lua/base46.lua +++ b/lua/base46.lua @@ -1,5 +1,4 @@ local M = {} - local config = require("core.utils").load_config() M.get_theme_tb = function(name, type) @@ -27,27 +26,32 @@ M.merge_tb = function(table1, table2) return vim.tbl_deep_extend("force", table1, table2) end -M.load_theme = function() - -- set bg option - local theme_type = M.get_theme_tb(vim.g.nvchad_theme, "type") -- dark/light - vim.opt.bg = theme_type - - -- clear highlights of bufferline (cuz of dynamic devicons hl group on the buffer) - local highlights_raw = vim.split(vim.api.nvim_exec("filter BufferLine hi", true), "\n") +-- credits to https://github.com/max397574 for this function +M.clear_highlights = function(hl_group) + local highlights_raw = vim.split(vim.api.nvim_exec("filter " .. hl_group .. " hi", true), "\n") local highlight_groups = {} for _, raw_hi in ipairs(highlights_raw) do - table.insert(highlight_groups, string.match(raw_hi, "BufferLine%a+")) + table.insert(highlight_groups, string.match(raw_hi, hl_group .. "%a+")) end for _, highlight in ipairs(highlight_groups) do vim.cmd([[hi clear ]] .. highlight) end - -- above highlights clear code by https://github.com/max397574 +end + +M.load_theme = function() + -- set bg option + local theme_type = M.get_theme_tb(vim.g.nvchad_theme, "type") -- dark/light + vim.opt.bg = theme_type + + M.clear_highlights "BufferLine" + M.clear_highlights "TS" -- reload highlights for theme switcher require("plenary.reload").reload_module "integrations" require("plenary.reload").reload_module "chadlights" + require("plenary.reload").reload_module "custom" require "chadlights" end diff --git a/lua/chadlights.lua b/lua/chadlights.lua index 6ec096c..6897e3c 100644 --- a/lua/chadlights.lua +++ b/lua/chadlights.lua @@ -46,7 +46,7 @@ if ui.hl_override then highlights = merge_tb(highlights, user_highlights) end --- local set_transparent = require("core.utils").load_config().ui.transparency +-- local set_transparent = nvchad.load_config().ui.transparency if ui.transparency then highlights = merge_tb(highlights, require "nv_glassy") end diff --git a/lua/hl_themes/aquarium.lua b/lua/hl_themes/aquarium.lua index 35fe158..d416778 100644 --- a/lua/hl_themes/aquarium.lua +++ b/lua/hl_themes/aquarium.lua @@ -40,9 +40,9 @@ M.base_16 = { base02 = "#3D4059", base03 = "#313449", base04 = "#63718b", - base05 = "#ced4df", - base06 = "#414560", - base07 = "#63718b", + base05 = "#bac0cb", + base06 = "#c5cbd6", + base07 = "#ced4df", base08 = "#ebb9b9", base09 = "#e8cca7", base0A = "#e6dfb8", diff --git a/lua/hl_themes/blossom.lua b/lua/hl_themes/blossom.lua index e651ee6..c9e865d 100644 --- a/lua/hl_themes/blossom.lua +++ b/lua/hl_themes/blossom.lua @@ -1,56 +1,66 @@ local M = {} M.base_30 = { - white = "#685c56", - darker_black = "#e5dedb", - black = "#ede6e3", -- nvim bg - black2 = "#e0d9d6", - one_bg = "#e2dbd8", - one_bg2 = "#d1cac7", - one_bg3 = "#cac3c0", - grey = "#bab3b0", - grey_fg = "#aea7a4", - grey_fg2 = "#a29b98", - light_grey = "#958e8b", - red = "#c99780", - baby_pink = "#ce9c85", - pink = "#ce9c85", - line = "#d9d2cf", -- for lines like vertsplit - green = "#839773", + white = "#695d57", + darker_black = "#dfd8d5", + black = "#e6dfdc", -- nvim bg + black2 = "#d9d2cf", + one_bg = "#d0c9c6", + one_bg2 = "#c7c0bd", + one_bg3 = "#c0b9b6", + grey = "#b9b2af", + grey_fg = "#b2aba8", + grey_fg2 = "#aaa3a0", + light_grey = "#a09996", + red = "#b28069", + baby_pink = "#b7856e", + pink = "#c18f78", + line = "#d3ccc9", -- for lines like vertsplit + green = "#6c805c", vibrant_green = "#899d79", - blue = "#6c8aa8", + blue = "#5f7d9b", nord_blue = "#5e5f65", yellow = "#a9a29f", - sun = "#eaa18a", + sun = "#d38a73", purple = "#a685a6", dark_purple = "#9c7b9c", - teal = "#62809e", - orange = "#e39a83", + teal = "#4b6987", + orange = "#cc836c", cyan = "#75998e", - statusline_bg = "#e4ddda", + statusline_bg = "#dfd8d5", lightbg = "#cac3c0", lightbg2 = "#dbd4d1", pmenu_bg = "#857e7b", - folder_bg = "#817a77", + folder_bg = "#746d6a", } M.base_16 = { - base00 = "#ede6e3", - base01 = "#dad3d0", - base02 = "#b6b0a6", - base03 = "#938d8a", - base04 = "#afabaa", - base05 = "#6c605a", - base06 = "#938680", - base07 = "#ede6e3", - base08 = "#978e81", - base09 = "#9c7b9c", - base0A = "#b6b0a6", - base0B = "#c99385", - base0C = "#ce9c85", - base0D = "#a09c80", - base0E = "#A3BE8C", - base0F = "#887c76", + base00 = "#e6dfdc", + base01 = "#ded7d4", + base02 = "#d7d0cd", + base03 = "#d1cac7", + base04 = "#cac3c0", + base05 = "#746862", + base06 = "#5e524c", + base07 = "#695d57", + base08 = "#8779a8", + base09 = "#a87678", + base0A = "#738199", + base0B = "#6c805c", + base0C = "#5e908e", + base0D = "#b3816a", + base0E = "#7e8e8e", + base0F = "#976153", +} + +M.polish_hl = { + WhichKeyDesc = { + fg = M.base_30.white, + }, + + WhichKey = { + fg = M.base_30.white, + }, } M.type = "light" diff --git a/lua/hl_themes/catppuccin.lua b/lua/hl_themes/catppuccin.lua index 2430477..93be227 100644 --- a/lua/hl_themes/catppuccin.lua +++ b/lua/hl_themes/catppuccin.lua @@ -5,21 +5,21 @@ M.base_30 = { darker_black = "#191828", black = "#1E1D2D", -- nvim bg black2 = "#252434", - one_bg = "#282737", -- real bg of onedark - one_bg2 = "#313040", - one_bg3 = "#393848", - grey = "#424151", - grey_fg = "#494858", - grey_fg2 = "#504f5f", - light_grey = "#585767", - red = "#F28FAD", + one_bg = "#2d2c3c", -- real bg of onedark + one_bg2 = "#363545", + one_bg3 = "#3e3d4d", + grey = "#474656", + grey_fg = "#4e4d5d", + grey_fg2 = "#555464", + light_grey = "#605f6f", + red = "#F38BA8", baby_pink = "#ffa5c3", pink = "#F5C2E7", - line = "#2a2e36", -- for lines like vertsplit + line = "#383747", -- for lines like vertsplit green = "#ABE9B3", vibrant_green = "#b6f4be", nord_blue = "#8bc2f0", - blue = "#96CDFB", + blue = "#89B4FA", yellow = "#FAE3B0", sun = "#ffe9b6", purple = "#DDB6F2", @@ -31,7 +31,8 @@ M.base_30 = { lightbg = "#2f2e3e", lightbg2 = "#282737", pmenu_bg = "#ABE9B3", - folder_bg = "#96CDFB", + folder_bg = "#89B4FA", + lavender = "#c7d1ff", } M.base_16 = { @@ -43,14 +44,28 @@ M.base_16 = { base05 = "#bfc6d4", base06 = "#ccd3e1", base07 = "#D9E0EE", - base08 = "#DDB6F2", - base09 = "#89DCEB", - base0A = "#F8BD96", + base08 = "#F38BA8", + base09 = "#F8BD96", + base0A = "#FAE3B0", base0B = "#ABE9B3", - base0C = "#F5C2E7", - base0D = "#96CDFB", - base0E = "#F28FAD", - base0F = "#E8A2AF", + base0C = "#89DCEB", + base0D = "#89B4FA", + base0E = "#CBA6F7", + base0F = "#F38BA8", +} + +M.polish_hl = { + TSVariable = { + fg = M.base_30.lavender, + }, + + TSProperty = { + fg = M.base_30.teal, + }, + + TSVariableBuiltin = { + fg = M.base_30.red, + }, } M.type = "dark" diff --git a/lua/hl_themes/chadracula.lua b/lua/hl_themes/chadracula.lua index 7ce5083..5bcba1b 100644 --- a/lua/hl_themes/chadracula.lua +++ b/lua/hl_themes/chadracula.lua @@ -2,9 +2,9 @@ local M = {} M.base_30 = { white = "#F8F8F2", - darker_black = "#232531", + darker_black = "#222430", black = "#282A36", -- nvim bg - black2 = "#303341", + black2 = "#2d303e", one_bg = "#373844", -- real bg of onedark one_bg2 = "#44475a", one_bg3 = "#565761", @@ -12,45 +12,56 @@ M.base_30 = { grey_fg = "#666771", grey_fg2 = "#6e6f79", light_grey = "#73747e", - red = "#E95678", - baby_pink = "#DE8C92", + red = "#ff7070", + baby_pink = "#ff86d3", pink = "#FF79C6", - line = "#373844", -- for lines like vertsplit - green = "#69ff94", - vibrant_green = "#69FF94", + line = "#3c3d49", -- for lines like vertsplit + green = "#50fa7b", + vibrant_green = "#5dff88", nord_blue = "#b389ef", - blue = "#BD93F9", + blue = "#a1b1e3", yellow = "#F1FA8C", sun = "#FFFFA5", purple = "#BD93F9", dark_purple = "#BD93F9", - teal = "#0088cc", + teal = "#92a2d4", orange = "#FFB86C", cyan = "#8BE9FD", - statusline_bg = "#2b2d39", - lightbg = "#343642", - lightbg2 = "#2f313d", + statusline_bg = "#2d2f3b", + lightbg = "#41434f", + lightbg2 = "#363844", pmenu_bg = "#b389ef", folder_bg = "#BD93F9", } M.base_16 = { - base00 = "#282a36", + base00 = "#282936", base01 = "#3a3c4e", - base02 = "#44475a", - base03 = "#6272a4", + base02 = "#4d4f68", + base03 = "#626483", base04 = "#62d6e8", base05 = "#e9e9f4", - base06 = "#6272a4", - base07 = "#ff95ef", - base08 = "#ffb86c", - base09 = "#bd93f9", - base0A = "#8be9fd", - base0B = "#ffffa5", - base0C = "#8be9fd", - base0D = "#69ff94", - base0E = "#ff92df", - base0F = "#f7f7fb", + base06 = "#f1f2f8", + base07 = "#f7f7fb", + base08 = "#c197fd", + base09 = "#FFB86C", + base0A = "#62d6e8", + base0B = "#F1FA8C", + base0C = "#8BE9FD", + base0D = "#50fa7b", + base0E = "#ff86d3", + base0F = "#F8F8F2", +} + +M.polish_hl = { + + TSFuncBuiltin = { + fg = M.base_30.cyan, + }, + + TSNumber = { + fg = M.base_30.purple, + }, } M.type = "dark" diff --git a/lua/hl_themes/chadtain.lua b/lua/hl_themes/chadtain.lua index 29ab0b8..656d5f3 100644 --- a/lua/hl_themes/chadtain.lua +++ b/lua/hl_themes/chadtain.lua @@ -2,7 +2,7 @@ local M = {} M.base_30 = { white = "#b0b0b0", - darker_black = "#171d23", + darker_black = "#151b21", black = "#1a2026", -- nvim bg black2 = "#20262c", one_bg = "#242a30", @@ -25,7 +25,7 @@ M.base_30 = { purple = "#a39ec4", dark_purple = "#8f8aac", teal = "#7c9cbc", - orange = "#e39a83", + orange = "#C9938A", cyan = "#9aafe6", statusline_bg = "#1e242a", lightbg = "#2d3339", @@ -40,17 +40,17 @@ M.base_16 = { base02 = "#292f35", base03 = "#2e343a", base04 = "#42484e", - base05 = "#d3d3d3", - base06 = "#d8d8d8", + base05 = "#bebebe", + base06 = "#bbbbbb", base07 = "#b0b0b0", - base08 = "#c49ea0", - base09 = "#b89294", - base0A = "#ccc9aa", + base08 = "#ac8a8c", + base09 = "#C9938A", + base0A = "#aca98a", base0B = "#8aac8b", base0C = "#8aabac", - base0D = "#6b8bab", - base0E = "#8f8aac", - base0F = "#8b6567", + base0D = "#7797b7", + base0E = "#948fb1", + base0F = "#ac8a8c", } M.type = "dark" diff --git a/lua/hl_themes/doomchad.lua b/lua/hl_themes/doomchad.lua index 5562286..c5ab233 100644 --- a/lua/hl_themes/doomchad.lua +++ b/lua/hl_themes/doomchad.lua @@ -15,11 +15,11 @@ M.base_30 = { red = "#ff6b5a", baby_pink = "#ff7665", pink = "#ff75a0", - line = "#2f333b", -- for lines like vertsplit + line = "#3b3f47", -- for lines like vertsplit green = "#98be65", vibrant_green = "#a9cf76", nord_blue = "#47a5e5", - blue = "#51afef", + blue = "#61afef", yellow = "#ECBE7B", sun = "#f2c481", purple = "#afa7e7", @@ -44,7 +44,7 @@ M.base_16 = { base06 = "#b3bac7", base07 = "#bbc2cf", base08 = "#ff6c6b", - base09 = "#da8548", + base09 = "#ea9558", base0A = "#ECBE7B", base0B = "#98be65", base0C = "#66c4ff", @@ -53,6 +53,12 @@ M.base_16 = { base0F = "#c85a50", } +M.polish_hl = { + TSFieldKey = { + fg = M.base_30.blue + } +} + M.type = "dark" M = require("base46").override_theme(M, "doomchad") diff --git a/lua/hl_themes/everforest.lua b/lua/hl_themes/everforest.lua index f13d0d2..d928542 100644 --- a/lua/hl_themes/everforest.lua +++ b/lua/hl_themes/everforest.lua @@ -38,11 +38,11 @@ M.base_16 = { base00 = "#2b3339", base01 = "#323c41", base02 = "#3a4248", - base03 = "#868d80", - base04 = "#d3c6aa", + base03 = "#424a50", + base04 = "#4a5258", base05 = "#d3c6aa", - base06 = "#e9e8d2", - base07 = "#fff9e8", + base06 = "#ddd0b4", + base07 = "#e7dabe", base08 = "#7fbbb3", base09 = "#d699b6", base0A = "#83c092", diff --git a/lua/hl_themes/everforest_light.lua b/lua/hl_themes/everforest_light.lua index 4024026..0cc9a3a 100644 --- a/lua/hl_themes/everforest_light.lua +++ b/lua/hl_themes/everforest_light.lua @@ -11,7 +11,7 @@ M.base_30 = { grey = "#a6b0a0", grey_fg = "#939f91", grey_fg2 = "#829181", - light_grey = "#61696f", + light_grey = "#798878", red = "#c85552", baby_pink = "#ce8196", pink = "#ef6590", @@ -36,25 +36,23 @@ M.base_30 = { M.base_16 = { base00 = "#fff9e8", - base01 = "#f7f4e0", - base02 = "#f0eed9", - base03 = "#868d80", - base04 = "#d3c6aa", - base05 = "#272f35", - base06 = "#e9e8d2", - base07 = "#fff9e8", + base01 = "#f6f0df", + base02 = "#ede7d6", + base03 = "#e5dfce", + base04 = "#ddd7c6", + base05 = "#495157", + base06 = "#3b4349", + base07 = "#272f35", base08 = "#5f9b93", base09 = "#b67996", base0A = "#8da101", - base0B = "#dfa000", - base0C = "#F96B68", + base0B = "#d59600", + base0C = "#ef615e", base0D = "#87a060", - base0E = "#f85552", - base0F = "#d699b6", + base0E = "#c85552", + base0F = "#c85552", } -M.type = "light" - M.polish_hl = { DiffAdd = { fg = M.base_30.green, @@ -65,7 +63,7 @@ M.polish_hl = { }, TSField = { - fg = "#454d53", + fg = M.base_16.base05, }, TSInclude = { @@ -76,10 +74,6 @@ M.polish_hl = { fg = M.base_30.blue, }, - TSPunctBracket = { - fg = M.base_16.base03, - }, - WhichKeyDesc = { fg = M.base_30.white, }, @@ -92,6 +86,9 @@ M.polish_hl = { fg = "#4e565c", }, } + +M.type = "light" + M = require("base46").override_theme(M, "everforest_light") return M diff --git a/lua/hl_themes/gruvbox.lua b/lua/hl_themes/gruvbox.lua index 737f93f..4871a3f 100644 --- a/lua/hl_themes/gruvbox.lua +++ b/lua/hl_themes/gruvbox.lua @@ -15,7 +15,7 @@ M.base_30 = { red = "#fb4934", baby_pink = "#cc241d", pink = "#ff75a0", - line = "#2c2f30", -- for lines like vertsplit + line = "#36393a", -- for lines like vertsplit green = "#b8bb26", vibrant_green = "#a9b665", nord_blue = "#83a598", @@ -28,10 +28,10 @@ M.base_30 = { orange = "#e78a4e", cyan = "#82b3a8", statusline_bg = "#2c2c2c", - lightbg = "#353535", - lightbg2 = "#303030", + lightbg = "#3d3d3d", + lightbg2 = "#323232", pmenu_bg = "#83a598", - folder_bg = "#83a598", + folder_bg = "#749689", } M.base_16 = { diff --git a/lua/hl_themes/gruvchad.lua b/lua/hl_themes/gruvchad.lua index 35930fa..89a2830 100644 --- a/lua/hl_themes/gruvchad.lua +++ b/lua/hl_themes/gruvchad.lua @@ -4,18 +4,18 @@ M.base_30 = { white = "#c7b89d", darker_black = "#1a1d1e", black = "#1e2122", -- nvim bg - black2 = "#232627", + black2 = "#242728", one_bg = "#282b2c", one_bg2 = "#393c3d", one_bg3 = "#404344", grey = "#484b4c", grey_fg = "#575a5b", grey_fg2 = "#545758", - light_grey = "#5a5d5e", + light_grey = "#606364", red = "#ec6b64", baby_pink = "#ce8196", pink = "#ff75a0", - line = "#2c2f30", -- for lines like vertsplit + line = "#323536", -- for lines like vertsplit green = "#89b482", vibrant_green = "#a9b665", nord_blue = "#6f8faf", diff --git a/lua/hl_themes/jellybeans.lua b/lua/hl_themes/jellybeans.lua index 48e1aa5..4d52ac2 100644 --- a/lua/hl_themes/jellybeans.lua +++ b/lua/hl_themes/jellybeans.lua @@ -15,7 +15,7 @@ M.base_30 = { red = "#cf6a4c", baby_pink = "#da7557", pink = "#f0a0c0", - line = "#232323", -- for lines like vertsplit + line = "#2d2d2d", -- for lines like vertsplit green = "#99ad6a", vibrant_green = "#c2cea6", nord_blue = "#768cb4", @@ -28,7 +28,7 @@ M.base_30 = { orange = "#e78a4e", cyan = "#8fbfdc", statusline_bg = "#191919", - lightbg = "#252525", + lightbg = "#2c2c2c", lightbg2 = "#1e1e1e", pmenu_bg = "#8197bf", folder_bg = "#8197bf", diff --git a/lua/hl_themes/kanagawa.lua b/lua/hl_themes/kanagawa.lua index e89daf2..b331080 100644 --- a/lua/hl_themes/kanagawa.lua +++ b/lua/hl_themes/kanagawa.lua @@ -12,10 +12,10 @@ M.base_30 = { grey_fg = "#4c4c55", grey_fg2 = "#53535c", light_grey = "#5c5c65", - red = "#E46876", + red = "#d8616b", baby_pink = "#D27E99", pink = "#c8748f", - line = "#272730", -- for lines like vertsplit + line = "#31313a", -- for lines like vertsplit green = "#98BB6C", vibrant_green = "#a3c677", nord_blue = "#7E9CD8", @@ -23,13 +23,13 @@ M.base_30 = { yellow = "#FF9E3B", sun = "#FFA066", purple = "#a48ec7", - dark_purple = "#957FB8", + dark_purple = "#9c86bf", teal = "#7AA89F", orange = "#fa9b61", cyan = "#A3D4D5", statusline_bg = "#24242d", lightbg = "#33333c", - lightbg2 = "#2b2b34", + lightbg2 = "#292932", pmenu_bg = "#a48ec7", folder_bg = "#7E9CD8", } @@ -38,19 +38,33 @@ M.base_16 = { base00 = "#1f1f28", base01 = "#2a2a37", base02 = "#223249", - base03 = "#727169", - base04 = "#c8c093", - base05 = "#dcd7ba", - base06 = "#938aa9", - base07 = "#363646", - base08 = "#e46876", + base03 = "#363646", + base04 = "#4c4c55", + base05 = "#c8c3a6", + base06 = "#d2cdb0", + base07 = "#DCD7BA", + base08 = "#d8616b", base09 = "#ffa066", base0A = "#dca561", base0B = "#98bb6c", base0C = "#7fb4ca", base0D = "#7e9cd8", - base0E = "#957fb8", - base0F = "#d27e99", + base0E = "#9c86bf", + base0F = "#d8616b", +} + +M.polish_hl = { + TSInclude = { + fg = M.base_30.purple, + }, + + TSURI = { + fg = M.base_30.blue, + }, + + TSTagDelimiter = { + fg = M.base_30.red, + }, } M.type = "dark" diff --git a/lua/hl_themes/monekai.lua b/lua/hl_themes/monekai.lua index c297991..5dcaa05 100644 --- a/lua/hl_themes/monekai.lua +++ b/lua/hl_themes/monekai.lua @@ -15,23 +15,23 @@ M.base_30 = { red = "#e36d76", baby_pink = "#f98385", pink = "#f36d76", - line = "#30333c", -- for lines like vertsplit + line = "#363942", -- for lines like vertsplit green = "#96c367", vibrant_green = "#99c366", nord_blue = "#81A1C1", blue = "#51afef", - yellow = "#d39467", + yellow = "#e6c181", sun = "#fce668", purple = "#c885d7", dark_purple = "#b26fc1", teal = "#34bfd0", orange = "#d39467", - cyan = "#51afef", + cyan = "#41afef", statusline_bg = "#292c35", lightbg = "#3d4049", lightbg2 = "#2e313a", pmenu_bg = "#99c366", - folder_bg = "#51afef", + folder_bg = "#61afef", } M.base_16 = { @@ -39,20 +39,28 @@ M.base_16 = { base01 = "#2a2e38", base02 = "#484854", base03 = "#545862", - base04 = "#9ca0a4", - base05 = "#bbc2cf", - base06 = "#5d656b", - base07 = "#4d5550", - base08 = "#51afef", - base09 = "#e18ef3", - base0A = "#5ac9d6", + base04 = "#5b5e67", + base05 = "#afb6c3", + base06 = "#b5bcc9", + base07 = "#bbc2cf", + base08 = "#d39467", + base09 = "#b3a5d4", + base0A = "#61afef", base0B = "#e6c181", - base0C = "#96c376", + base0C = "#61afef", base0D = "#96c376", base0E = "#e36d76", - base0F = "#bbc2cf", + base0F = "#e36d76", } +M.polish_hl = { + TSParameter = { + fg = M.base_30.blue, + }, + TSFieldKey = { + fg = M.base_30.red, + }, +} M.type = "dark" M = require("base46").override_theme(M, "monekai") diff --git a/lua/hl_themes/mountain.lua b/lua/hl_themes/mountain.lua index cb3d9a2..7a8aa8a 100644 --- a/lua/hl_themes/mountain.lua +++ b/lua/hl_themes/mountain.lua @@ -4,7 +4,7 @@ M.base_30 = { white = "#F0f0f0", darker_black = "#090909", black = "#0f0f0f", -- nvim bg - black2 = "#151515", + black2 = "#181818", one_bg = "#191919", one_bg2 = "#222222", one_bg3 = "#2a2a2a", @@ -14,14 +14,14 @@ M.base_30 = { light_grey = "#535353", red = "#ac8a8c", baby_pink = "#bb999b", - pink = "#e89199", - line = "#191919", -- for lines like vertsplit + pink = "#AC8AAC", + line = "#242424", -- for lines like vertsplit green = "#8aac8b", vibrant_green = "#99bb9a", - blue = "#A39EC4", - nord_blue = "#b2add3", + blue = "#9691b3", + nord_blue = "#8F8AAC", yellow = "#ACA98A", - sun = "#d3d0ad", + sun = "#b3b091", purple = "#C49EC4", dark_purple = "#b58fb5", teal = "#8fb4b5", @@ -29,9 +29,9 @@ M.base_30 = { cyan = "#9EC3C4", statusline_bg = "#131313", lightbg = "#292929", - lightbg2 = "#232323", + lightbg2 = "#212121", pmenu_bg = "#8aac8b", - folder_bg = "#A39EC4", + folder_bg = "#8F8AAC", } M.base_16 = { @@ -40,17 +40,24 @@ M.base_16 = { base02 = "#191919", base03 = "#222222", base04 = "#535353", - base05 = "#f0f0f0", - base06 = "#d8d8d8", - base07 = "#414141", - base08 = "#ac8a8c", - base09 = "#d3d0ad", - base0A = "#ACA98A", + base05 = "#d8d8d8", + base06 = "#e6e6e6", + base07 = "#f0f0f0", + base08 = "#b18f91", + base09 = "#d8bb92", + base0A = "#b1ae8f", base0B = "#8aac8b", - base0C = "#9EC3C4", - base0D = "#8fb4b5", - base0E = "#C49EC4", - base0F = "#9d9a7b", + base0C = "#91b2b3", + base0D = "#a5a0c2", + base0E = "#ac8aac", + base0F = "#b39193", +} + +M.polish_hl = { + TSVariable = { + fg = M.base_16.base05, + }, + } M.type = "dark" diff --git a/lua/hl_themes/nightlamp.lua b/lua/hl_themes/nightlamp.lua index 2eb4541..3473133 100644 --- a/lua/hl_themes/nightlamp.lua +++ b/lua/hl_themes/nightlamp.lua @@ -1,21 +1,21 @@ local M = {} M.base_30 = { - white = "#f1ebd1", - darker_black = "#15161c", + white = "#e0d6bd", + darker_black = "#13141a", black = "#18191f", --nvim bg - black2 = "#1e1f25", - one_bg = "#222329", - one_bg2 = "#28292f", - one_bg3 = "#2e2f35", - grey = "#38393f", - grey_fg = "#43444a", - grey_fg2 = "#48494f", - light_grey = "#505157", + black2 = "#202127", + one_bg = "#27282e", + one_bg2 = "#2d2e34", + one_bg3 = "#33343a", + grey = "#3d3e44", + grey_fg = "#48494f", + grey_fg2 = "#4d4e54", + light_grey = "#55565c", red = "#a67476", baby_pink = "#d6b3bd", pink = "#c99aa7", - line = "#24252b", --for lines like vertsplit + line = "#313238", --for lines like vertsplit green = "#8aa387", vibrant_green = "#94ad91", nord_blue = "#8d9bb3", @@ -25,12 +25,12 @@ M.base_30 = { purple = "#b8aad9", dark_purple = "#a99bca", teal = "#7aacaa", - orange = "#c8916d", + orange = "#cd9672", cyan = "#90a0a0", statusline_bg = "#1d1e24", lightbg = "#2b2c32", - lightbg2 = "#24252b", - pmenu_bg = "#8aa387", + lightbg2 = "#222329", + pmenu_bg = "#b58385", folder_bg = "#90a0a0", } @@ -39,18 +39,18 @@ M.base_16 = { base01 = "#222329", base02 = "#2c2d33", base03 = "#3c3d43", - base04 = "#b5ac9b", - base05 = "#cbc0ab", - base06 = "#e0d6bd", - base07 = "#f1ebd1", + base04 = "#48494f", + base05 = "#b8af9e", + base06 = "#cbc0ab", + base07 = "#e0d6bd", base08 = "#b8aad9", - base09 = "#b17f81", - base0A = "#d4ae80", + base09 = "#cd9672", + base0A = "#ccb89c", base0B = "#8aa387", - base0C = "#9ba292", - base0D = "#c495a2", - base0E = "#8896ae", - base0F = "#d0d0c7", + base0C = "#7aacaa", + base0D = "#b58385", + base0E = "#8e9cb4", + base0F = "#90a0a0", } M.type = "dark" diff --git a/lua/hl_themes/nightowl.lua b/lua/hl_themes/nightowl.lua index 9e06091..66e02e6 100644 --- a/lua/hl_themes/nightowl.lua +++ b/lua/hl_themes/nightowl.lua @@ -2,21 +2,21 @@ local M = {} M.base_30 = { white = "#d6deeb", - darker_black = "#001122", + darker_black = "#010f20", black = "#011627", - black2 = "#061b2c", - one_bg = "#0b2031", -- real bg of onedark - one_bg2 = "#152a3b", - one_bg3 = "#1f3445", - grey = "#293e4f", - grey_fg = "#314657", - grey_fg2 = "#394e5f", - light_grey = "#8b9f9f", + black2 = "#091e2f", + one_bg = "#112637", -- real bg of onedark + one_bg2 = "#1b3041", + one_bg3 = "#253a4b", + grey = "#2c4152", + grey_fg = "#34495a", + grey_fg2 = "#3c5162", + light_grey = "#495e6f", red = "#f78c6c", baby_pink = "#ff6cca", pink = "#fa58b6", - line = "#091e2f", - green = "#addb67", + line = "#182d3e", + green = "#29E68E", vibrant_green = "#22da6e", blue = "#82aaff", nord_blue = "#78a0f5", @@ -26,31 +26,49 @@ M.base_30 = { dark_purple = "#a974cc", teal = "#96CEB4", orange = "#FFAD60", - cyan = "#93FFD8", + cyan = "#aad2ff", statusline_bg = "#051a2b", - lightbg = "#112637", - lightbg2 = "#0b2031", - pmenu_bg = "#addb67", + lightbg = "#1a2f40", + lightbg2 = "#0e2334", + pmenu_bg = "#82aaff", folder_bg = "#82aaff", } M.base_16 = { - base00 = "#011627", -- bg - base01 = "#0c2132", -- lightbg - base02 = "#172c3d", -- selection bg - base03 = "#223748", -- comments, line highlighting - base04 = "#2c4152", -- dark foreground - base05 = "#aeb6c3", -- Default Foreground, Caret, Delimiters, Operators - base06 = "#d6deeb", -- Light Foreground (Not often used) - base07 = "#feffff", -- Light Background (Not often used) - base08 = "#7fdbca", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted - base09 = "#f78c6c", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url - base0A = "#c792ea", -- Classes, Markup Bold, Search Text Background - base0B = "#ecc48d", -- Strings, Inherited Class, Markup Code, Diff Inserted - base0C = "#91b9ff", -- Support, Regular Expressions, Escape Characters, Markup Quotes - base0D = "#82aaff", -- Functions, Methods, Attribute IDs, Headings - base0E = "#c792ea", -- Keywords, Storage, Selector, Markup Italic, Diff Changed - base0F = "#d6deeb", -- Deprecated, Opening/Closing Embedded Language Tags, e.g. + base00 = "#011627", + base01 = "#0c2132", + base02 = "#172c3d", + base03 = "#223748", + base04 = "#2c4152", + base05 = "#ced6e3", + base06 = "#d6deeb", + base07 = "#feffff", + base08 = "#ecc48d", + base09 = "#f78c6c", + base0A = "#c792ea", + base0B = "#29E68E", + base0C = "#aad2ff", + base0D = "#82aaff", + base0E = "#c792ea", + base0F = "#f78c6c", +} + +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, + }, } M.type = "dark" diff --git a/lua/hl_themes/nord.lua b/lua/hl_themes/nord.lua index 9e1f923..b75cf39 100644 --- a/lua/hl_themes/nord.lua +++ b/lua/hl_themes/nord.lua @@ -15,7 +15,7 @@ M.base_30 = { red = "#BF616A", baby_pink = "#de878f", pink = "#d57780", - line = "#3a404c", -- for lines like vertsplit + line = "#414753", -- for lines like vertsplit green = "#A3BE8C", vibrant_green = "#afca98", blue = "#7797b7", @@ -53,6 +53,15 @@ M.base_16 = { base0F = "#B48EAD", } +M.polish_hl = { + TSPunctBracket = { + fg = M.base_30.white, + }, + + TSPunctDelimiter = { + fg = M.base_30.white, + }, +} M.type = "dark" M = require("base46").override_theme(M, "nord") diff --git a/lua/hl_themes/one_light.lua b/lua/hl_themes/one_light.lua index 1dd85aa..4827f0f 100644 --- a/lua/hl_themes/one_light.lua +++ b/lua/hl_themes/one_light.lua @@ -15,7 +15,7 @@ M.base_30 = { red = "#d84a3d", baby_pink = "#F07178", pink = "#ff75a0", - line = "#e9e9e9", -- for lines like vertsplit + line = "#e2e2e2", -- for lines like vertsplit green = "#50a14f", vibrant_green = "#7eca9c", nord_blue = "#428bab", @@ -36,10 +36,10 @@ M.base_30 = { M.base_16 = { base00 = "#fafafa", - base01 = "#f0f0f1", + base01 = "#f4f4f4", base02 = "#e5e5e6", - base03 = "#a0a1a7", - base04 = "#696c77", + base03 = "#dfdfe0", + base04 = "#d7d7d8", base05 = "#383a42", base06 = "#202227", base07 = "#090a0b", @@ -88,6 +88,21 @@ M.polish_hl = { DiffAdd = { fg = M.base_16.base05, }, + + FelineDirName = { + fg = M.base_30.black, + bg = M.base_30.nord_blue, + }, + + FelineDirName_Separator = { + fg = M.base_30.nord_blue, + bg = M.base_30.statusline_bg, + }, + + FelineFileName_Separator = { + fg = M.base_30.lightbg, + bg = M.base_30.nord_blue, + }, } M = require("base46").override_theme(M, "one_light") diff --git a/lua/hl_themes/onedark.lua b/lua/hl_themes/onedark.lua index 7438ea2..b144859 100644 --- a/lua/hl_themes/onedark.lua +++ b/lua/hl_themes/onedark.lua @@ -12,11 +12,11 @@ M.base_30 = { grey_fg = "#565c64", grey_fg2 = "#6f737b", light_grey = "#6f737b", - red = "#d47d85", + red = "#e06c75", baby_pink = "#DE8C92", pink = "#ff75a0", - line = "#2a2e36", -- for lines like vertsplit - green = "#A3BE8C", + line = "#31353d", -- for lines like vertsplit + green = "#98c379", vibrant_green = "#7eca9c", nord_blue = "#81A1C1", blue = "#61afef", @@ -30,7 +30,7 @@ M.base_30 = { statusline_bg = "#22262e", lightbg = "#2d3139", lightbg2 = "#262a32", - pmenu_bg = "#A3BE8C", + pmenu_bg = "#98c379", folder_bg = "#61afef", } diff --git a/lua/hl_themes/onenord.lua b/lua/hl_themes/onenord.lua index 7f3021e..f14e90a 100644 --- a/lua/hl_themes/onenord.lua +++ b/lua/hl_themes/onenord.lua @@ -15,7 +15,7 @@ M.base_30 = { red = "#d57780", baby_pink = "#de878f", pink = "#da838b", - line = "#3a404c", -- for lines like vertsplit + line = "#414753", -- for lines like vertsplit green = "#A3BE8C", vibrant_green = "#afca98", blue = "#7797b7", @@ -35,22 +35,22 @@ M.base_30 = { } M.base_16 = { - base0A = "#EBCB8B", - base04 = "#566074", - base07 = "#ced4df", - base05 = "#bfc5d0", - base0E = "#B48EAD", - base0D = "#81A1C1", - base0C = "#97b7d7", - base0B = "#A3BE8C", + base00 = "#2a303c", + base01 = "#3B4252", base02 = "#434C5E", - base0F = "#d57780", base03 = "#4C566A", + base04 = "#566074", + base05 = "#bfc5d0", + base06 = "#c7cdd8", + base07 = "#ced4df", base08 = "#d57780", - base01 = "#3B4252", - base00 = "#2a303c", base09 = "#e39a83", - base06 = "#c7cdd8", + base0A = "#EBCB8B", + base0B = "#A3BE8C", + base0C = "#97b7d7", + base0D = "#81A1C1", + base0E = "#B48EAD", + base0F = "#d57780", } M.type = "dark" diff --git a/lua/hl_themes/palenight.lua b/lua/hl_themes/palenight.lua index 8ad2df7..4583b70 100644 --- a/lua/hl_themes/palenight.lua +++ b/lua/hl_themes/palenight.lua @@ -1,7 +1,7 @@ local M = {} M.base_30 = { - white = "#9198B6", -- custom + white = "#ffffff", -- custom darker_black = "#232738", black = "#292D3E", -- nvim bg black2 = "#2f3344", @@ -15,7 +15,7 @@ M.base_30 = { red = "#f07178", baby_pink = "#606475", pink = "#ff5370", -- base16 - line = "#383c4d", -- for lines like vertsplit + line = "#3f4354", -- for lines like vertsplit green = "#c3e88d", --base16 vibrant_green = "#96e88d", -- custom nord_blue = "#8fb7ff", @@ -25,12 +25,12 @@ M.base_30 = { purple = "#c792ea", -- base16 dark_purple = "#b383d2", --custom teal = "#89ffe6", -- custom - orange = "#f78c6c", -- base16 + orange = "#ffa282", -- base16 cyan = "#89ddff", -- base16 statusline_bg = "#2d3142", - lightbg = "#363a4b", - lightbg2 = "#303445", - pmenu_bg = "#89ffe6", -- custom + lightbg = "#3c4051", + lightbg2 = "#333748", + pmenu_bg = "#82aaff", -- custom folder_bg = "#82aaff", } @@ -40,11 +40,11 @@ M.base_16 = { base02 = "#32374d", base03 = "#676e95", base04 = "#8796b0", - base05 = "#959dcb", - base06 = "#959dcb", + base05 = "#d3d3d3", + base06 = "#efefef", base07 = "#ffffff", base08 = "#f07178", - base09 = "#f78c6c", + base09 = "#ffa282", base0A = "#ffcb6b", base0B = "#c3e88d", base0C = "#89ddff", @@ -53,6 +53,18 @@ M.base_16 = { base0F = "#ff5370", } +M.polish_hl = { + TSInclude = { + fg = M.base_30.purple, + }, + LuaTSField = { + fg = M.base_30.yellow, + }, + TSFieldKey = { + fg = M.base_30.orange, + }, +} + M.type = "dark" M = require("base46").override_theme(M, "palenight") diff --git a/lua/hl_themes/radium.lua b/lua/hl_themes/radium.lua index 92273fe..18bb6e7 100644 --- a/lua/hl_themes/radium.lua +++ b/lua/hl_themes/radium.lua @@ -4,18 +4,18 @@ M.base_30 = { white = "#d4d4d5", darker_black = "#0a0d11", black = "#101317", -- nvim bg - black2 = "#171b20", - one_bg = "#1c1f23", - one_bg2 = "#24272b", - one_bg3 = "#2e3135", - grey = "#393c40", - grey_fg = "#404347", - grey_fg2 = "#45484c", - light_grey = "#4b4e52", + black2 = "#191d22", + one_bg = "#212428", + one_bg2 = "#292c30", + one_bg3 = "#33363a", + grey = "#3e4145", + grey_fg = "#45484c", + grey_fg2 = "#4a4d51", + light_grey = "#525559", red = "#f87070", baby_pink = "#ff8e8e", pink = "#ffa7a7", - line = "#292933", -- for lines like vertsplit + line = "#30303a", -- for lines like vertsplit green = "#37d99e", vibrant_green = "#79dcaa", blue = "#7ab0df", @@ -36,10 +36,10 @@ M.base_30 = { M.base_16 = { base00 = "#101317", - base01 = "#171C21", - base02 = "#1c2026", - base03 = "#20252b", - base04 = "#3d464e", + base01 = "#1a1d21", + base02 = "#23262a", + base03 = "#2b2e32", + base04 = "#323539", base05 = "#c5c5c6", base06 = "#cbcbcc", base07 = "#d4d4d5", @@ -53,6 +53,16 @@ M.base_16 = { base0F = "#e87979", } +M.polish_hl = { + TSPunctBracket = { + fg = M.base_16.base07, + }, + + TSParenthesis = { + link = "TSPunctBracket" + }, +} + M.type = "dark" M = require("base46").override_theme(M, "radium") diff --git a/lua/hl_themes/rxyhn.lua b/lua/hl_themes/rxyhn.lua index defab13..0331b16 100644 --- a/lua/hl_themes/rxyhn.lua +++ b/lua/hl_themes/rxyhn.lua @@ -15,7 +15,7 @@ M.base_30 = { red = "#DF5B61", baby_pink = "#EE6A70", pink = "#F16269", - line = "#152024", -- for lines like vertsplit + line = "#222d31", -- for lines like vertsplit green = "#78B892", vibrant_green = "#8CD7AA", nord_blue = "#5A84BC", diff --git a/lua/hl_themes/solarized.lua b/lua/hl_themes/solarized.lua deleted file mode 100644 index 080b3cf..0000000 --- a/lua/hl_themes/solarized.lua +++ /dev/null @@ -1,60 +0,0 @@ -local M = {} - -M.base_30 = { - white = "#839496", - darker_black = "#002530", - black = "#002b36", - black2 = "#06313c", - one_bg = "#0a3540", - one_bg2 = "#133e49", - one_bg3 = "#1b4651", - grey = "#28535e", - grey_fg = "#325d68", - grey_fg2 = "#3c6772", - light_grey = "#446f7a", - red = "#dc322f", - baby_pink = "#eb413e", - pink = "#fd5ffe", - line = "#0f3a45", - green = "#a6e22e", - vibrant_green = "#bffb47", - nord_blue = "#59cce2", - blue = "#66d9ef", - yellow = "#e6db74", - sun = "#eee37c", - purple = "#ae81ff", - dark_purple = "#9f72f0", - teal = "#4dc0d6", - orange = "#fd971f", - cyan = "#a1efe4", - statusline_bg = "#042f3a", - lightbg = "#113c47", - lightbg2 = "#0b3641", - pmenu_bg = "#A3BE8C", - folder_bg = "#61afef", -} - -M.base_16 = { - base00 = "#002b36", - base01 = "#073642", - base02 = "#586e75", - base03 = "#657b83", - base04 = "#839496", - base05 = "#93a1a1", - base06 = "#eee8d5", - base07 = "#fdf6e3", - base08 = "#dc322f", - base09 = "#cb4b16", - base0A = "#b58900", - base0B = "#859900", - base0C = "#2aa198", - base0D = "#268bd2", - base0E = "#6c71c4", - base0F = "#d33682", -} - -M.type = "dark" - -M = require("base46").override_theme(M, "solarized") - -return M diff --git a/lua/hl_themes/tokyodark.lua b/lua/hl_themes/tokyodark.lua index d59ebd7..d2c2147 100644 --- a/lua/hl_themes/tokyodark.lua +++ b/lua/hl_themes/tokyodark.lua @@ -1,17 +1,17 @@ local M = {} M.base_30 = { - white = "#abb2bf", - darker_black = "#0e0f1a", + white = "#A0A8CD", + darker_black = "#0c0d18", black = "#11121D", -- nvim bg black2 = "#171823", - one_bg = "#191a25", - one_bg2 = "#21222d", - one_bg3 = "#2c2d38", - grey = "#383944", - grey_fg = "#3e3f4a", - grey_fg2 = "#454651", - light_grey = "#4b4c57", + one_bg = "#1d1e29", + one_bg2 = "#252631", + one_bg3 = "#252631", + grey = "#40414c", + grey_fg = "#474853", + grey_fg2 = "#4e4f5a", + light_grey = "#545560", red = "#ee6d85", baby_pink = "#fd7c94", pink = "#fe6D85", @@ -27,11 +27,11 @@ M.base_30 = { teal = "#519aba", orange = "#f6955b", cyan = "#38a89d", - statusline_bg = "#151621", - lightbg = "#262732", - lightbg2 = "#1c1d28", - pmenu_bg = "#98C379", - folder_bg = "#8094B4", + statusline_bg = "#161722", + lightbg = "#2a2b36", + lightbg2 = "#22232e", + pmenu_bg = "#ee6d85", + folder_bg = "#7199ee", } M.base_16 = { @@ -42,7 +42,7 @@ M.base_16 = { base04 = "#30313c", base05 = "#abb2bf", base06 = "#b2b9c6", - base07 = "#b9c0cd", + base07 = "#A0A8CD", base08 = "#ee6d85", base09 = "#7199ee", base0A = "#7199ee", diff --git a/lua/hl_themes/tokyonight.lua b/lua/hl_themes/tokyonight.lua index fffce60..3c37490 100644 --- a/lua/hl_themes/tokyonight.lua +++ b/lua/hl_themes/tokyonight.lua @@ -4,7 +4,7 @@ M.base_30 = { white = "#c0caf5", darker_black = "#16161e", black = "#1a1b26", -- nvim bg - black2 = "#24283b", + black2 = "#1f2336", one_bg = "#24283b", one_bg2 = "#414868", one_bg3 = "#353b45", @@ -15,7 +15,7 @@ M.base_30 = { red = "#f7768e", baby_pink = "#DE8C92", pink = "#ff75a0", - line = "#242530", -- for lines like vertsplit + line = "#32333e", -- for lines like vertsplit green = "#9ece6a", vibrant_green = "#73daca", nord_blue = "#80a8fd", @@ -24,33 +24,39 @@ M.base_30 = { sun = "#EBCB8B", purple = "#bb9af7", dark_purple = "#9d7cd8", - teal = "#0db9d7", + teal = "#1abc9c", orange = "#ff9e64", cyan = "#7dcfff", statusline_bg = "#1d1e29", - lightbg = "#252631", - lightbg2 = "#22232e", + lightbg = "#32333e", + lightbg2 = "#262732", pmenu_bg = "#7aa2f7", folder_bg = "#7aa2f7", } M.base_16 = { - base0A = "#e0af68", - base04 = "#565c64", - base07 = "#c0caf5", - base05 = "#a9b1d6", - base0E = "#9d7cd8", - base0D = "#7aa2f7", - base0C = "#2ac3de", - base0B = "#9ece6a", + base00 = "#1A1B26", + base01 = "#3b4261", base02 = "#3b4261", - base0F = "#9abdf5", base03 = "#545c7e", + base04 = "#565c64", + base05 = "#a9b1d6", + base06 = "#bbc5f0", + base07 = "#c0caf5", base08 = "#f7768e", - base01 = "#3b4261", - base00 = "#1A1B26", base09 = "#ff9e64", - base06 = "#bbc5f0", + base0A = "#ffd089", + base0B = "#9ece6a", + base0C = "#2ac3de", + base0D = "#7aa2f7", + base0E = "#bb9af7", + base0F = "#c0caf5", +} + +M.polish_hl = { + TSVariable = { fg = M.base_30.red }, + TSFuncBuiltin = { fg = M.base_30.cyan }, + TSParameter = { fg = M.base_30.white }, } M.type = "dark" diff --git a/lua/hl_themes/tomorrow_night.lua b/lua/hl_themes/tomorrow_night.lua index dfb8ad9..913c5e0 100644 --- a/lua/hl_themes/tomorrow_night.lua +++ b/lua/hl_themes/tomorrow_night.lua @@ -5,7 +5,7 @@ M.base_30 = { darker_black = "#191b1d", black = "#1d1f21", -- nvim bg black2 = "#232527", - one_bg = "#363a41", + one_bg = "#2d2f31", one_bg2 = "#353b45", one_bg3 = "#30343c", grey = "#434547", @@ -15,7 +15,7 @@ M.base_30 = { red = "#cc6666", baby_pink = "#FF6E79", pink = "#ff9ca3", - line = "#27292b", -- for lines like vertsplit + line = "#313335", -- for lines like vertsplit green = "#a4b595", vibrant_green = "#a3b991", nord_blue = "#728da8", @@ -55,6 +55,13 @@ M.base_16 = { M.type = "dark" +M.polish_hl = { + PmenuSel = { + fg = M.base_30.black, + bg = M.base_30.red, + }, +} + M = require("base46").override_theme(M, "tomorrow_night") return M diff --git a/lua/hl_themes/wombat.lua b/lua/hl_themes/wombat.lua index 088b26f..fa18540 100644 --- a/lua/hl_themes/wombat.lua +++ b/lua/hl_themes/wombat.lua @@ -1,58 +1,67 @@ local M = {} M.base_30 = { - white = "#c6c6c6", - darker_black = "#030303", - black = "#080808", - black2 = "#131313", - one_bg = "#1c1c1c", - one_bg2 = "#222222", - one_bg3 = "#292929", - grey = "#4d4d4d", - grey_fg = "#575757", - grey_fg2 = "#616161", - light_grey = "#6b6b6b", - red = "#ff2026", - baby_pink = "#DB5C00", - pink = "#e5786d", - line = "#333333", - green = "#87d75f", - vibrant_green = "#66ea5a", - nord_blue = "#779fef", - blue = "#87afff", - yellow = "#d7ff87", - sun = "#fbe44c", - purple = "#d787ff", - dark_purple = "#73186e", - teal = "#2a0d6a", - orange = "#d7875f", - cyan = "#66c4ff", - statusline_bg = "#313131", - lightbg = "#3e3e3e", - lightbg2 = "#363636", - pmenu_bg = "#87d75f", - folder_bg = "#87afff", + white = "#e4e0d7", + darker_black = "#1b1b1b", + black = "#222222", + black2 = "#292929", + one_bg = "#333333", + one_bg2 = "#3a3a3a", + one_bg3 = "#414141", + grey = "#4b4b4b", + grey_fg = "#535353", + grey_fg2 = "#5a5a5a", + light_grey = "#646464", + red = "#FF8F7E", + baby_pink = "#f58eff", + pink = "#e780f8", + line = "#353535", + green = "#AEE474", + vibrant_green = "#95e454", + nord_blue = "#8dbdfb", + blue = "#88B8F6", + yellow = "#efdeab", + sun = "#feedba", + purple = "#dc8cff", + dark_purple = "#c878f0", + teal = "#7EB6BC", + orange = "#FFCC66", + cyan = "#90fdf8", + statusline_bg = "#262626", + lightbg = "#3c3c3c", + lightbg2 = "#323232", + pmenu_bg = "#95e454", + folder_bg = "#7BB0C9", } M.base_16 = { - base00 = "#080808", - base01 = "#1c1c1c", - base02 = "#292929", - base03 = "#87875f", - base04 = "#857b6f", - base05 = "#c6c6c6", - base06 = "#d2d2d2", - base07 = "#dedede", - base08 = "#c6c6c6", - base09 = "#d7875f", - base0A = "#d7ff87", - base0B = "#87d75f", - base0C = "#ffd7af", - base0D = "#d7ff87", - base0E = "#87afff", + base00 = "#202020", + base01 = "#303030", + base02 = "#373737", + base03 = "#3e3e3e", + base04 = "#484848", + base05 = "#d6d2c9", + base06 = "#ddd9d0", + base07 = "#e4e0d7", + base08 = "#FF8F7E", + base09 = "#FFCC66", + base0A = "#efdeab", + base0B = "#AEE474", + base0C = "#7EB6BC", + base0D = "#88B8F6", + base0E = "#dc8cff", base0F = "#dc8c64", } +M.polish_hl = { + TSInclude = { fg = M.base_30.red }, + TSConstructor = { fg = M.base_30.orange }, + TSVariable = { link = "TSConstructor" }, + TSConditional = { link = "TSInclude" }, + Feline_LspIcon = { fg = M.base_30.teal }, + FelineIcon = { bg = M.base_30.teal }, +} + M.type = "dark" M = require("base46").override_theme(M, "wombat") diff --git a/lua/integrations/bufferline.lua b/lua/integrations/bufferline.lua index f6439da..8f51aa0 100644 --- a/lua/integrations/bufferline.lua +++ b/lua/integrations/bufferline.lua @@ -3,7 +3,7 @@ local colors = require("base46").get_colors "base_30" return { BufferLineBackground = { - fg = colors.grey_fg, + fg = colors.light_grey, bg = colors.black2, }, @@ -93,7 +93,11 @@ return { }, BufferLineDevIconDefaultSelected = { - bg = "NONE", + bg = "none", + }, + + BufferLineDevIconDefaultInactive = { + bg = "none", }, BufferLineDuplicate = { @@ -113,6 +117,7 @@ return { BufferLineRightCustomAreaText1 = { fg = colors.white, }, + BufferLineRightCustomAreaText2 = { fg = colors.red, }, diff --git a/lua/integrations/feline.lua b/lua/integrations/feline.lua index 331c007..f13691f 100644 --- a/lua/integrations/feline.lua +++ b/lua/integrations/feline.lua @@ -38,7 +38,7 @@ return { }, Feline_diffIcons = { - fg = colors.grey_fg2, + fg = colors.light_grey, bg = colors.statusline_bg, }, @@ -118,6 +118,11 @@ return { Feline_EmptySpace = { fg = colors.one_bg2, + bg = colors.one_bg, + }, + + Feline_EmptySpace_git = { + fg = colors.one_bg, bg = colors.statusline_bg, }, @@ -133,6 +138,6 @@ return { Feline_PositionSeparator = { fg = colors.green, - bg = colors.grey, + bg = colors.one_bg2, }, } diff --git a/lua/integrations/nvchad.lua b/lua/integrations/nvchad.lua index 5c474c4..1595098 100644 --- a/lua/integrations/nvchad.lua +++ b/lua/integrations/nvchad.lua @@ -101,11 +101,9 @@ return { -- vim-matchup MatchWord = { - fg = black, - bg = white, + bg = grey, + fg = white, }, - MatchParen = { link = "MatchWord" }, - MatchWordCur = { }, - MatchParenCur = { link = "MatchWordCur" }, + MatchParen = { link = "MatchWord" }, } diff --git a/lua/integrations/treesitter.lua b/lua/integrations/treesitter.lua index b95872a..0ac3275 100644 --- a/lua/integrations/treesitter.lua +++ b/lua/integrations/treesitter.lua @@ -165,4 +165,12 @@ return { TSCurrentScope = { bold = true, }, + + luaTSField = { + fg = theme.base07, + }, + + TSFieldKey = { + fg = theme.base08, + }, }