use background as lookup instead of base_name

lua/zenbones/build.lua

@@ -77,12 +77,12 @@ function M.run()
 	-- neobones light
 	package.loaded["neobones"] = nil
 	vim.opt.background = "light"
-	build("neobones_light", require "neobones", require("neobones.palette").zenbones, { exclude = { "vim" } })
+	build("neobones_light", require "neobones", require("neobones.palette").light, { exclude = { "vim" } })
 
 	-- neobones dark
 	package.loaded["neobones"] = nil
 	vim.opt.background = "dark"
-	build("neobones_dark", require "neobones", require("neobones.palette").zenflesh, { exclude = { "vim" } })
+	build("neobones_dark", require "neobones", require("neobones.palette").dark, { exclude = { "vim" } })
 end
 
 return M

lua/zenbones/init.lua

@@ -1,4 +1,4 @@
 local generator = require "zenbones.specs"
 local p = require "zenbones.palette"
 
-return generator.generate(p, "zenbones", generator.get_global_config "zenbones")
+return generator.generate(p, "light", generator.get_global_config "zenbones")

lua/zenbones/palette.lua

@@ -1,3 +1,3 @@
 local util = require "zenbones.util"
 
-return util.palette_extend({}, "zenbones")
+return util.palette_extend({}, "light")

lua/zenbones/specs/init.lua

@@ -1,34 +1,26 @@
 local M = {}
 
-function M.get_global_config(base_name, prefix)
-	prefix = type(prefix) == "string" and prefix or base_name
-	if base_name == "zenbones" then
+function M.get_global_config(prefix, base_bg)
+	if base_bg == "light" then
 		return {
 			lightness = vim.g[prefix .. "_lightness"],
 			comment_gui = vim.g[prefix .. "_italic_comments"] ~= false and "italic" or "NONE",
 			dim_noncurrent_window = vim.g[prefix .. "_dim_noncurrent_window"],
 			solid_vert_split = vim.g[prefix .. "_solid_vert_split"],
 		}
-	elseif base_name == "zenflesh" then
+	else
 		return {
 			darkness = vim.g[prefix .. "_darkness"],
 			comment_gui = vim.g[prefix .. "_italic_comments"] ~= false and "italic" or "NONE",
 			lighten_noncurrent_window = vim.g[prefix .. "_lighten_noncurrent_window"],
 			solid_vert_split = vim.g[prefix .. "_solid_vert_split"],
 		}
-	else
-		error "Unknown base_name"
 	end
 end
 
-function M.generate(p, base_name, opt)
-	if base_name == "zenbones" then
-		return require "zenbones.specs.zenbones"(p, opt)
-	elseif base_name == "zenflesh" then
-		return require "zenbones.specs.zenflesh"(p, opt)
-	else
-		error "Unknown base_name"
-	end
+function M.generate(p, base_bg, opt)
+	base_bg = base_bg ~= nil and base_bg or "dark"
+	return require("zenbones.specs." .. base_bg)(p, opt)
 end
 
 return M

lua/zenbones/util.lua

@@ -7,14 +7,10 @@ function M.interp(s, tab)
 	end))
 end
 
-function M.bg_to_base_name()
-	return vim.opt.background:get() == "light" and "zenbones" or "zenflesh"
-end
-
-function M.palette_extend(p, base_name)
+function M.palette_extend(p, base_bg)
 	local lush = require "lush"
 	local hsluv = lush.hsluv
-	if base_name == "zenbones" then
+	if base_bg == "light" then
 		p = vim.tbl_extend("keep", p, {
 			bg = hsluv(39, 12, 94), -- sand
 			fg = hsluv(230, 30, 22), -- stone
@@ -37,7 +33,7 @@ function M.palette_extend(p, base_name)
 			sky1 = p.sky.sa(20).da(16),
 			fg1 = p.fg.li(22),
 		})
-	elseif base_name == "zenflesh" then
+	else
 		-- default
 		p = vim.tbl_extend("keep", p, {
 			bg = hsluv(39, 9, 9), -- sand
@@ -62,8 +58,6 @@ function M.palette_extend(p, base_name)
 			sky1 = p.sky.sa(20).li(16),
 			fg1 = p.fg.da(22),
 		})
-	else
-		error "Unknown base_name"
 	end
 end