From 18668b59cbbd5be885201c9f8aa7336223d54f2e Mon Sep 17 00:00:00 2001 From: siduck Date: Sun, 22 May 2022 14:19:27 +0530 Subject: [PATCH] fix weird theme colors on light terminal bg | https://github.com/NvChad/NvChad/issues/1046 thanks to @tamton-aquib as he informed me about the :h bg option! --- lua/base46.lua | 14 ++++++++++---- lua/hl_themes/aquarium.lua | 2 ++ lua/hl_themes/blossom.lua | 2 ++ lua/hl_themes/catppuccin.lua | 2 ++ lua/hl_themes/chadracula.lua | 2 ++ lua/hl_themes/chadtain.lua | 2 ++ lua/hl_themes/doomchad.lua | 2 ++ lua/hl_themes/everforest.lua | 2 ++ lua/hl_themes/everforest_light.lua | 2 ++ lua/hl_themes/gruvbox.lua | 2 ++ lua/hl_themes/gruvchad.lua | 2 ++ lua/hl_themes/jellybeans.lua | 2 ++ lua/hl_themes/kanagawa.lua | 2 ++ lua/hl_themes/monekai.lua | 2 ++ lua/hl_themes/mountain.lua | 2 ++ lua/hl_themes/nightlamp.lua | 2 ++ lua/hl_themes/nightowl.lua | 2 ++ lua/hl_themes/nord.lua | 2 ++ lua/hl_themes/one_light.lua | 2 ++ lua/hl_themes/onedark.lua | 2 ++ lua/hl_themes/onenord.lua | 2 ++ lua/hl_themes/palenight.lua | 2 ++ lua/hl_themes/pastelDark.lua | 2 ++ lua/hl_themes/radium.lua | 2 ++ lua/hl_themes/rxyhn.lua | 2 ++ lua/hl_themes/solarized.lua | 2 ++ lua/hl_themes/tokyodark.lua | 2 ++ lua/hl_themes/tokyonight.lua | 4 ++++ lua/hl_themes/tomorrow_night.lua | 2 ++ lua/hl_themes/wombat.lua | 2 ++ 30 files changed, 70 insertions(+), 4 deletions(-) diff --git a/lua/base46.lua b/lua/base46.lua index ce1bcb7..06320a2 100644 --- a/lua/base46.lua +++ b/lua/base46.lua @@ -1,9 +1,6 @@ local M = {} -M.get_colors = function(type) - local name = vim.g.nvchad_theme - - -- theme paths +M.get_theme_tb = function(name, type) local default_path = "hl_themes." .. name local user_path = "custom.themes." .. name @@ -19,11 +16,20 @@ M.get_colors = function(type) end end +M.get_colors = function(type) + local name = vim.g.nvchad_theme + return M.get_theme_tb(name, type) +end + 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") local highlight_groups = {} diff --git a/lua/hl_themes/aquarium.lua b/lua/hl_themes/aquarium.lua index c7b483c..35fe158 100644 --- a/lua/hl_themes/aquarium.lua +++ b/lua/hl_themes/aquarium.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#eAc1c1", } +M.type = "dark" + M = require("base46").override_theme(M, "aquarium") return M diff --git a/lua/hl_themes/blossom.lua b/lua/hl_themes/blossom.lua index bab400f..e651ee6 100644 --- a/lua/hl_themes/blossom.lua +++ b/lua/hl_themes/blossom.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#887c76", } +M.type = "light" + M = require("base46").override_theme(M, "blossom") return M diff --git a/lua/hl_themes/catppuccin.lua b/lua/hl_themes/catppuccin.lua index 5fe2281..2430477 100644 --- a/lua/hl_themes/catppuccin.lua +++ b/lua/hl_themes/catppuccin.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#E8A2AF", } +M.type = "dark" + M = require("base46").override_theme(M, "catppuccin") return M diff --git a/lua/hl_themes/chadracula.lua b/lua/hl_themes/chadracula.lua index 7f67486..7ce5083 100644 --- a/lua/hl_themes/chadracula.lua +++ b/lua/hl_themes/chadracula.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#f7f7fb", } +M.type = "dark" + M = require("base46").override_theme(M, "chadracula") return M diff --git a/lua/hl_themes/chadtain.lua b/lua/hl_themes/chadtain.lua index a7ca282..29ab0b8 100644 --- a/lua/hl_themes/chadtain.lua +++ b/lua/hl_themes/chadtain.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#8b6567", } +M.type = "dark" + M = require("base46").override_theme(M, "chadtain") return M diff --git a/lua/hl_themes/doomchad.lua b/lua/hl_themes/doomchad.lua index 912f557..5562286 100644 --- a/lua/hl_themes/doomchad.lua +++ b/lua/hl_themes/doomchad.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#c85a50", } +M.type = "dark" + M = require("base46").override_theme(M, "doomchad") return M diff --git a/lua/hl_themes/everforest.lua b/lua/hl_themes/everforest.lua index 5718e27..f13d0d2 100644 --- a/lua/hl_themes/everforest.lua +++ b/lua/hl_themes/everforest.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#e67e80", } +M.type = "dark" + M.polish_hl = { TSPunctBracket = { fg = M.base_30.red, diff --git a/lua/hl_themes/everforest_light.lua b/lua/hl_themes/everforest_light.lua index f0dfc14..4024026 100644 --- a/lua/hl_themes/everforest_light.lua +++ b/lua/hl_themes/everforest_light.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#d699b6", } +M.type = "light" + M.polish_hl = { DiffAdd = { fg = M.base_30.green, diff --git a/lua/hl_themes/gruvbox.lua b/lua/hl_themes/gruvbox.lua index 64f59e5..737f93f 100644 --- a/lua/hl_themes/gruvbox.lua +++ b/lua/hl_themes/gruvbox.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#d65d0e", } +M.type = "dark" + M = require("base46").override_theme(M, "gruvbox") return M diff --git a/lua/hl_themes/gruvchad.lua b/lua/hl_themes/gruvchad.lua index 44bc7ae..35930fa 100644 --- a/lua/hl_themes/gruvchad.lua +++ b/lua/hl_themes/gruvchad.lua @@ -53,6 +53,8 @@ M.base_16 = { base06 = "#c3b499", } +M.type = "dark" + M = require("base46").override_theme(M, "gruvchad") return M diff --git a/lua/hl_themes/jellybeans.lua b/lua/hl_themes/jellybeans.lua index 7bdef81..48e1aa5 100644 --- a/lua/hl_themes/jellybeans.lua +++ b/lua/hl_themes/jellybeans.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#cf6a4c", } +M.type = "dark" + M = require("base46").override_theme(M, "jellybeans") return M diff --git a/lua/hl_themes/kanagawa.lua b/lua/hl_themes/kanagawa.lua index 9c3b45a..e89daf2 100644 --- a/lua/hl_themes/kanagawa.lua +++ b/lua/hl_themes/kanagawa.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#d27e99", } +M.type = "dark" + M = require("base46").override_theme(M, "kanagawa") return M diff --git a/lua/hl_themes/monekai.lua b/lua/hl_themes/monekai.lua index 336ec9f..c297991 100644 --- a/lua/hl_themes/monekai.lua +++ b/lua/hl_themes/monekai.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#bbc2cf", } +M.type = "dark" + M = require("base46").override_theme(M, "monekai") return M diff --git a/lua/hl_themes/mountain.lua b/lua/hl_themes/mountain.lua index 03beda9..cb3d9a2 100644 --- a/lua/hl_themes/mountain.lua +++ b/lua/hl_themes/mountain.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#9d9a7b", } +M.type = "dark" + M = require("base46").override_theme(M, "mountain") return M diff --git a/lua/hl_themes/nightlamp.lua b/lua/hl_themes/nightlamp.lua index 0c9a1d4..2eb4541 100644 --- a/lua/hl_themes/nightlamp.lua +++ b/lua/hl_themes/nightlamp.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#d0d0c7", } +M.type = "dark" + M = require("base46").override_theme(M, "nightlamp") return M diff --git a/lua/hl_themes/nightowl.lua b/lua/hl_themes/nightowl.lua index e885209..9e06091 100644 --- a/lua/hl_themes/nightowl.lua +++ b/lua/hl_themes/nightowl.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#d6deeb", -- Deprecated, Opening/Closing Embedded Language Tags, e.g. } +M.type = "dark" + M = require("base46").override_theme(M, "nightowl") return M diff --git a/lua/hl_themes/nord.lua b/lua/hl_themes/nord.lua index 90af54b..9e1f923 100644 --- a/lua/hl_themes/nord.lua +++ b/lua/hl_themes/nord.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#B48EAD", } +M.type = "dark" + M = require("base46").override_theme(M, "nord") return M diff --git a/lua/hl_themes/one_light.lua b/lua/hl_themes/one_light.lua index c61dcf9..1dd85aa 100644 --- a/lua/hl_themes/one_light.lua +++ b/lua/hl_themes/one_light.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#986801", } +M.type = "light" + M.polish_hl = { WhichKeyDesc = { fg = M.base_30.white, diff --git a/lua/hl_themes/onedark.lua b/lua/hl_themes/onedark.lua index 370fbd2..7438ea2 100644 --- a/lua/hl_themes/onedark.lua +++ b/lua/hl_themes/onedark.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#be5046", } +M.type = "dark" + M = require("base46").override_theme(M, "onedark") return M diff --git a/lua/hl_themes/onenord.lua b/lua/hl_themes/onenord.lua index 4e994b0..7f3021e 100644 --- a/lua/hl_themes/onenord.lua +++ b/lua/hl_themes/onenord.lua @@ -53,6 +53,8 @@ M.base_16 = { base06 = "#c7cdd8", } +M.type = "dark" + M = require("base46").override_theme(M, "onenord") return M diff --git a/lua/hl_themes/palenight.lua b/lua/hl_themes/palenight.lua index cf90578..8ad2df7 100644 --- a/lua/hl_themes/palenight.lua +++ b/lua/hl_themes/palenight.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#ff5370", } +M.type = "dark" + M = require("base46").override_theme(M, "palenight") return M diff --git a/lua/hl_themes/pastelDark.lua b/lua/hl_themes/pastelDark.lua index 11cfe75..1085870 100644 --- a/lua/hl_themes/pastelDark.lua +++ b/lua/hl_themes/pastelDark.lua @@ -53,6 +53,8 @@ M.base_16 = { base06 = "#d3d9e4", } +M.type = "dark" + M = require("base46").override_theme(M, "javacafe") return M diff --git a/lua/hl_themes/radium.lua b/lua/hl_themes/radium.lua index be228b8..92273fe 100644 --- a/lua/hl_themes/radium.lua +++ b/lua/hl_themes/radium.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#e87979", } +M.type = "dark" + M = require("base46").override_theme(M, "radium") return M diff --git a/lua/hl_themes/rxyhn.lua b/lua/hl_themes/rxyhn.lua index fb0f242..defab13 100644 --- a/lua/hl_themes/rxyhn.lua +++ b/lua/hl_themes/rxyhn.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#F16269", } +M.type = "dark" + M = require("base46").override_theme(M, "rxyhn") return M diff --git a/lua/hl_themes/solarized.lua b/lua/hl_themes/solarized.lua index f7a1664..080b3cf 100644 --- a/lua/hl_themes/solarized.lua +++ b/lua/hl_themes/solarized.lua @@ -53,6 +53,8 @@ M.base_16 = { 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 659fdca..d59ebd7 100644 --- a/lua/hl_themes/tokyodark.lua +++ b/lua/hl_themes/tokyodark.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#f3627a", } +M.type = "dark" + M = require("base46").override_theme(M, "tokyodark") return M diff --git a/lua/hl_themes/tokyonight.lua b/lua/hl_themes/tokyonight.lua index 451c778..fffce60 100644 --- a/lua/hl_themes/tokyonight.lua +++ b/lua/hl_themes/tokyonight.lua @@ -53,4 +53,8 @@ M.base_16 = { base06 = "#bbc5f0", } +M.type = "dark" + +M = require("base46").override_theme(M, "tokyonight") + return M diff --git a/lua/hl_themes/tomorrow_night.lua b/lua/hl_themes/tomorrow_night.lua index 14b4e02..dfb8ad9 100644 --- a/lua/hl_themes/tomorrow_night.lua +++ b/lua/hl_themes/tomorrow_night.lua @@ -53,6 +53,8 @@ M.base_16 = { base06 = "#e0e0e0", } +M.type = "dark" + 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 1f315c9..088b26f 100644 --- a/lua/hl_themes/wombat.lua +++ b/lua/hl_themes/wombat.lua @@ -53,6 +53,8 @@ M.base_16 = { base0F = "#dc8c64", } +M.type = "dark" + M = require("base46").override_theme(M, "wombat") return M