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!
v2.5
siduck 4 years ago
parent 5980ef7803
commit 18668b59cb

@ -1,9 +1,6 @@
local M = {} local M = {}
M.get_colors = function(type) M.get_theme_tb = function(name, type)
local name = vim.g.nvchad_theme
-- theme paths
local default_path = "hl_themes." .. name local default_path = "hl_themes." .. name
local user_path = "custom.themes." .. name local user_path = "custom.themes." .. name
@ -19,11 +16,20 @@ M.get_colors = function(type)
end end
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) M.merge_tb = function(table1, table2)
return vim.tbl_deep_extend("force", table1, table2) return vim.tbl_deep_extend("force", table1, table2)
end end
M.load_theme = function() 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) -- 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 highlights_raw = vim.split(vim.api.nvim_exec("filter BufferLine hi", true), "\n")
local highlight_groups = {} local highlight_groups = {}

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#eAc1c1", base0F = "#eAc1c1",
} }
M.type = "dark"
M = require("base46").override_theme(M, "aquarium") M = require("base46").override_theme(M, "aquarium")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#887c76", base0F = "#887c76",
} }
M.type = "light"
M = require("base46").override_theme(M, "blossom") M = require("base46").override_theme(M, "blossom")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#E8A2AF", base0F = "#E8A2AF",
} }
M.type = "dark"
M = require("base46").override_theme(M, "catppuccin") M = require("base46").override_theme(M, "catppuccin")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#f7f7fb", base0F = "#f7f7fb",
} }
M.type = "dark"
M = require("base46").override_theme(M, "chadracula") M = require("base46").override_theme(M, "chadracula")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#8b6567", base0F = "#8b6567",
} }
M.type = "dark"
M = require("base46").override_theme(M, "chadtain") M = require("base46").override_theme(M, "chadtain")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#c85a50", base0F = "#c85a50",
} }
M.type = "dark"
M = require("base46").override_theme(M, "doomchad") M = require("base46").override_theme(M, "doomchad")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#e67e80", base0F = "#e67e80",
} }
M.type = "dark"
M.polish_hl = { M.polish_hl = {
TSPunctBracket = { TSPunctBracket = {
fg = M.base_30.red, fg = M.base_30.red,

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#d699b6", base0F = "#d699b6",
} }
M.type = "light"
M.polish_hl = { M.polish_hl = {
DiffAdd = { DiffAdd = {
fg = M.base_30.green, fg = M.base_30.green,

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#d65d0e", base0F = "#d65d0e",
} }
M.type = "dark"
M = require("base46").override_theme(M, "gruvbox") M = require("base46").override_theme(M, "gruvbox")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base06 = "#c3b499", base06 = "#c3b499",
} }
M.type = "dark"
M = require("base46").override_theme(M, "gruvchad") M = require("base46").override_theme(M, "gruvchad")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#cf6a4c", base0F = "#cf6a4c",
} }
M.type = "dark"
M = require("base46").override_theme(M, "jellybeans") M = require("base46").override_theme(M, "jellybeans")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#d27e99", base0F = "#d27e99",
} }
M.type = "dark"
M = require("base46").override_theme(M, "kanagawa") M = require("base46").override_theme(M, "kanagawa")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#bbc2cf", base0F = "#bbc2cf",
} }
M.type = "dark"
M = require("base46").override_theme(M, "monekai") M = require("base46").override_theme(M, "monekai")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#9d9a7b", base0F = "#9d9a7b",
} }
M.type = "dark"
M = require("base46").override_theme(M, "mountain") M = require("base46").override_theme(M, "mountain")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#d0d0c7", base0F = "#d0d0c7",
} }
M.type = "dark"
M = require("base46").override_theme(M, "nightlamp") M = require("base46").override_theme(M, "nightlamp")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#d6deeb", -- Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?> base0F = "#d6deeb", -- Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
} }
M.type = "dark"
M = require("base46").override_theme(M, "nightowl") M = require("base46").override_theme(M, "nightowl")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#B48EAD", base0F = "#B48EAD",
} }
M.type = "dark"
M = require("base46").override_theme(M, "nord") M = require("base46").override_theme(M, "nord")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#986801", base0F = "#986801",
} }
M.type = "light"
M.polish_hl = { M.polish_hl = {
WhichKeyDesc = { WhichKeyDesc = {
fg = M.base_30.white, fg = M.base_30.white,

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#be5046", base0F = "#be5046",
} }
M.type = "dark"
M = require("base46").override_theme(M, "onedark") M = require("base46").override_theme(M, "onedark")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base06 = "#c7cdd8", base06 = "#c7cdd8",
} }
M.type = "dark"
M = require("base46").override_theme(M, "onenord") M = require("base46").override_theme(M, "onenord")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#ff5370", base0F = "#ff5370",
} }
M.type = "dark"
M = require("base46").override_theme(M, "palenight") M = require("base46").override_theme(M, "palenight")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base06 = "#d3d9e4", base06 = "#d3d9e4",
} }
M.type = "dark"
M = require("base46").override_theme(M, "javacafe") M = require("base46").override_theme(M, "javacafe")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#e87979", base0F = "#e87979",
} }
M.type = "dark"
M = require("base46").override_theme(M, "radium") M = require("base46").override_theme(M, "radium")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#F16269", base0F = "#F16269",
} }
M.type = "dark"
M = require("base46").override_theme(M, "rxyhn") M = require("base46").override_theme(M, "rxyhn")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#d33682", base0F = "#d33682",
} }
M.type = "dark"
M = require("base46").override_theme(M, "solarized") M = require("base46").override_theme(M, "solarized")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#f3627a", base0F = "#f3627a",
} }
M.type = "dark"
M = require("base46").override_theme(M, "tokyodark") M = require("base46").override_theme(M, "tokyodark")
return M return M

@ -53,4 +53,8 @@ M.base_16 = {
base06 = "#bbc5f0", base06 = "#bbc5f0",
} }
M.type = "dark"
M = require("base46").override_theme(M, "tokyonight")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base06 = "#e0e0e0", base06 = "#e0e0e0",
} }
M.type = "dark"
M = require("base46").override_theme(M, "tomorrow_night") M = require("base46").override_theme(M, "tomorrow_night")
return M return M

@ -53,6 +53,8 @@ M.base_16 = {
base0F = "#dc8c64", base0F = "#dc8c64",
} }
M.type = "dark"
M = require("base46").override_theme(M, "wombat") M = require("base46").override_theme(M, "wombat")
return M return M

Loading…
Cancel
Save