add vim.opt.bg in defaults base46_cache

README.md

@@ -20,7 +20,7 @@ M.base_16 = {
   -- some colors 
 }
 
-vim.opt.bg = "dark" -- this can be either dark or light
+M.type = "dark" -- this can be either dark or light
 
 M = require("base46").override_theme(M, "atheme")
 

lua/base46/init.lua

@@ -95,10 +95,13 @@ end
 
 -- save table
 M.table_to_file = function(filename, tb)
-  local file = io.open(filename, "w")
+  local theme_type = M.get_theme_tb "type" -- dark / light
+  local cache_path = vim.fn.stdpath "data" .. "/site/pack/base46_cache/start/compiled_themes/lua/base46_cache/"
+  local file = io.open(cache_path .. filename, "w")
 
   if file then
-    local result = ""
+    -- set vim.opt.bg code in defaults.lua only
+    local result = filename == "defaults.lua" and "M.type='" .. theme_type .. "'" or ""
 
     for hlgroupName, hlgroup_vals in pairs(tb) do
       local hlname = "'" .. hlgroupName .. "',"
@@ -119,7 +122,6 @@ end
 
 M.compile = function()
   local hl_files = vim.fn.stdpath "data" .. "/site/pack/packer/start/base46/lua/base46/integrations"
-  local cache_path = vim.fn.stdpath "data" .. "/site/pack/base46_cache/start/compiled_themes/lua/base46_cache/"
 
   for _, file in ipairs(vim.fn.readdir(hl_files)) do
     local integration = M.load_highlight(vim.fn.fnamemodify(file, ":r"))
@@ -129,7 +131,7 @@ M.compile = function()
       integration = M.merge_tb(integration, (M.turn_str_to_color(config.ui.hl_add)))
     end
 
-    M.table_to_file(cache_path .. file, integration)
+    M.table_to_file(file, integration)
   end
 end
 

lua/base46/themes/aquarium.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#eAc1c1",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "aquarium")
 

lua/base46/themes/ayu-dark.lua

@@ -63,6 +63,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "ayu-dark")
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 return M

lua/base46/themes/ayu-light.lua

@@ -66,6 +66,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "ayu-light")
 
-vim.opt.bg = "light"
+M.type = "light"
 
 return M

lua/base46/themes/bearded-arc.lua

@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#FF738A",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M.polish_hl = {
   Conditional = {

lua/base46/themes/blossom.lua

@@ -65,7 +65,7 @@ M.polish_hl = {
   St_pos_text = { fg = M.base_30.white },
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "blossom")
 

lua/base46/themes/catppuccin.lua

@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@variable.builtin"] = { fg = M.base_30.red },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "catppuccin")
 

lua/base46/themes/catppuccin_latte.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#62657f",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   TelescopePromptPrefix = { fg = M.base_30.white },

lua/base46/themes/chadracula.lua

@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@number"] = { fg = M.base_30.purple },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "chadracula")
 

lua/base46/themes/chadtain.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#ac8a8c",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "chadtain")
 

lua/base46/themes/chocolate.lua

@@ -68,7 +68,7 @@ M.polish_hl = {
   ["@function.builtin"] = { fg = M.base_30.yellow },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "chocolate")
 

lua/base46/themes/dark_horizon.lua

@@ -65,7 +65,7 @@ M.polish_hl = {
   ["@tag.attribute"] = { fg = M.base_16.orange },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "dark_horizon")
 

lua/base46/themes/decay.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#e05f65",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "decay")
 

lua/base46/themes/doomchad.lua

@@ -56,7 +56,7 @@ M.polish_hl = {
   ["@field"] = { fg = M.base_30.blue },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "doomchad")
 

lua/base46/themes/everforest.lua

@@ -52,7 +52,8 @@ M.base_16 = {
   base0F = "#d699b6",
 }
 
-vim.opt.bg = "dark"
+
+M.type = "dark"
 
 M.polish_hl = {
   ["@tag"] = { fg = M.base_30.orange },

lua/base46/themes/everforest_light.lua

@@ -67,7 +67,7 @@ M.polish_hl = {
   ["@constructor"] = { fg = M.base_30.blue },
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "everforest_light")
 

lua/base46/themes/falcon.lua

@@ -66,7 +66,7 @@ M.polish_hl = {
   ["@keyword"] = { fg = M.base_16.base0D },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "falcon")
 

lua/base46/themes/gatekeeper.lua

@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@parameter"] = { fg = M.base_30.white },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gatekeeper")
 

lua/base46/themes/github_dark.lua

@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#85e89d", -- Deprecated, open/close embedded tags
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M.polish_hl = {
   PmenuSel = {

lua/base46/themes/github_light.lua

@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#18654B", -- Deprecated, open/close embedded tags
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   ["@punctuation.bracket"] = {

lua/base46/themes/gruvbox.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d65d0e",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gruvbox")
 

lua/base46/themes/gruvbox_light.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d65d0e",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   TbLineThemeToggleBtn = { fg = M.base_30.black, bg = M.base_30.white },

lua/base46/themes/gruvbox_material.lua

@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@property"] = { fg = M.base_16.base0C },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gruvbox_material")
 

lua/base46/themes/gruvchad.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base06 = "#c3b499",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gruvchad")
 

lua/base46/themes/jellybeans.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#cf6a4c",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "jellybeans")
 

lua/base46/themes/kanagawa.lua

@@ -61,7 +61,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "kanagawa")
 

lua/base46/themes/monekai.lua

@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@field.key"] = { fg = M.base_30.red },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "monekai")
 

lua/base46/themes/monochrome.lua

@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@punctuation.bracket"] = { fg = M.base_30.red },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "monochrome")
 

lua/base46/themes/mountain.lua

@@ -56,7 +56,7 @@ M.polish_hl = {
   ["@variable"] = { fg = M.base_16.base05 },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "mountain")
 

lua/base46/themes/nightfox.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d85e7c",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nightfox")
 

lua/base46/themes/nightlamp.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#90a0a0",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nightlamp")
 

lua/base46/themes/nightowl.lua

@@ -59,7 +59,7 @@ M.polish_hl = {
   PmenuSel = { bg = M.base_30.blue },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nightowl")
 

lua/base46/themes/nord.lua

@@ -56,7 +56,7 @@ M.polish_hl = {
   ["@punctuation.bracket"] = { fg = M.base_30.white },
   ["@punctuation.delimiter"] = { fg = M.base_30.white },
 }
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nord")
 

lua/base46/themes/oceanic-light.lua

@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#9a806d",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "oceanic-next-light")
 

lua/base46/themes/oceanic-next.lua

@@ -65,7 +65,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "oceanic-next")
 

lua/base46/themes/one_light.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#986801",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   TelescopePromptPrefix = { fg = M.base_30.white },

lua/base46/themes/onedark.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#be5046",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "onedark")
 

lua/base46/themes/onenord.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d57780",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "onenord")
 

lua/base46/themes/onenord_light.lua

@@ -65,6 +65,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "onenord_light")
 
-vim.opt.bg = "light"
+M.type = "light"
 
 return M

lua/base46/themes/oxocarbon.lua

@@ -66,7 +66,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "oxocarbon")
 

lua/base46/themes/palenight.lua

@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@field.key"] = { fg = M.base_30.orange },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "palenight")
 

lua/base46/themes/pastelDark.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base06 = "#d3d9e4",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "javacafe")
 

lua/base46/themes/penumbra_dark.lua

@@ -89,7 +89,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "penumbra_dark")
 

lua/base46/themes/penumbra_light.lua

@@ -82,7 +82,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "penumbra_light")
 

lua/base46/themes/radium.lua

@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@parenthesis"] = { link = "@punctuation.bracket" },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "radium")
 

lua/base46/themes/rosepine.lua

@@ -54,6 +54,6 @@ M.base_16 = {
 
 M = require("base46").override_theme(M, "rosepine")
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 return M

lua/base46/themes/rxyhn.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#F16269",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "rxyhn")
 

lua/base46/themes/solarized_dark.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d33682",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "solarized_dark")
 

lua/base46/themes/sweetpastel.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#e5a3a1",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "sweetpastel")
 

lua/base46/themes/tokyodark.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#f3627a",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "tokyodark")
 

lua/base46/themes/tokyonight.lua

@@ -58,7 +58,7 @@ M.polish_hl = {
   ["@parameter"] = { fg = M.base_30.white },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "tokyonight")
 

lua/base46/themes/tomorrow_night.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base06 = "#e0e0e0",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M.polish_hl = {
   PmenuSel = { fg = M.base_30.black, bg = M.base_30.red },

lua/base46/themes/vscode_dark.lua

@@ -64,7 +64,7 @@ M.polish_hl = {
   ["@keywordfunction"] = { fg = M.base_30.teal },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "vscode_dark")
 

lua/base46/themes/wombat.lua

@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@conditional"] = { link = "@include" },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "wombat")
 

lua/base46/themes/yoru.lua

@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#e8646a",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "yoru")