breaking: palette generator and refactor term

lua/zenbones/neobones/palette.lua

@@ -1,23 +1,20 @@
+local util = require "zenbones.util"
 local lush = require "lush"
 local hsluv = lush.hsluv
 
 local M = {}
 
-local zenbones_p = require "zenbones.palette"
-local zenbones = vim.tbl_extend("keep", {
+M.zenbones = util.palette_extend({
 	-- bg = hsluv "#d3e4db" -- --accent-bg-color
 	bg = hsluv "#e7eee8", -- --bg-color
 	fg = hsluv "#202e18", -- --accent-color
-	leaf = hsluv "#8fff6d", -- need to make green more prominent
-	leaf = zenbones_p.leaf.sa(24).li(8), -- need to make green more prominent
-}, zenbones_p)
-M.zenbones = zenbones
+}, "zenbones")
+M.zenbones.leaf = M.zenbones.leaf.sa(24).li(8) -- need to make green more prominent
 
-local zenflesh = vim.tbl_extend("keep", {
+M.zenflesh = util.palette_extend({
 	bg = hsluv "#0f191f", -- --bg-color
 	fg = hsluv "#c7d6d0", -- --fg-color
 	leaf = hsluv "#8fff6d", -- --accent-color
-}, require "zenflesh.palette")
-M.zenflesh = zenflesh
+}, "zenflesh")
 
 return M

lua/zenbones/neobones/term.lua

@@ -1,51 +0,0 @@
-local palette = require "zenbones.neobones.palette"
-
-local M = { colors = {} }
-
-local p = palette.zenbones
-M.colors.zenbones = {
-	p.bg,
-	p.rose,
-	p.leaf,
-	p.wood,
-	p.water,
-	p.blossom,
-	p.sky,
-	p.fg,
-	p.bg.sa(4).da(16),
-	p.rose.sa(20).da(16),
-	p.leaf.sa(20).da(16),
-	p.wood.sa(18).da(16),
-	p.water.sa(20).da(16),
-	p.blossom.sa(24).da(16),
-	p.sky.sa(20).da(16),
-	p.fg.li(22),
-}
-
-p = palette.zenflesh
-M.colors.zenflesh = {
-	p.bg,
-	p.rose,
-	p.leaf,
-	p.wood,
-	p.water,
-	p.blossom,
-	p.sky,
-	p.fg,
-	p.bg.sa(4).li(16),
-	p.rose.sa(20).li(16),
-	p.leaf.sa(20).li(16),
-	p.wood.sa(18).li(16),
-	p.water.sa(20).li(16),
-	p.blossom.sa(24).li(16),
-	p.sky.sa(20).li(16),
-	p.fg.da(22),
-}
-
-function M.setup(base_name)
-	for i, v in ipairs(M.colors[base_name]) do
-		vim.g["terminal_color_" .. (i - 1)] = v.hex
-	end
-end
-
-return M