breaking: palette generator and refactor term

lua/zenbones/rosebones/palette.lua

@@ -1,9 +1,10 @@
+local util = require "zenbones.util"
 local lush = require "lush"
 local hsluv = lush.hsluv
 
 local M = {}
 
-local zenbones = {
+M.zenbones = util.palette_extend({
 	bg = hsluv(57.9, 49.8, 96.5), -- base
 	fg = hsluv(14.5, 32, 36), -- rose, base: 14.5, 51.1, 63.3
 	rose = hsluv(355.6, 38.5, 51.9), -- love
@@ -13,13 +14,11 @@ local zenbones = {
 	blossom = hsluv(283.8, 30.2, 54.8), -- iris
 	sky = hsluv(208.6, 65.3, 57.7), -- foam
 	text = hsluv(270.1, 22.9, 36.8), -- text, base: 270.1, 22.9, 36.8
-}
-zenbones.bg_bright = zenbones.bg.abs_li(3).sa(6)
-zenbones.bg_dim = zenbones.bg.abs_da(3)
-M.zenbones = zenbones
+}, "zenbones")
 
-local zenflesh = {
+M.zenflesh = util.palette_extend({
 	bg = hsluv(271.2, 20.2, 8.5), -- base
+	bg_warm = hsluv(268.9, 24.5, 13.9), -- base moon
 	fg = hsluv(14.8, 21, 82), -- rose, base: 2, 55, 83
 	rose = hsluv(357.2, 75.7, 62.6), -- love
 	leaf = hsluv(227.7, 81.8, 45.8), -- pine
@@ -28,9 +27,6 @@ local zenflesh = {
 	blossom = hsluv(283.1, 67.3, 73), -- iris
 	sky = hsluv(206.7, 42.9, 80), -- foam
 	text = hsluv(269.4, 56, 89.2), -- text, base: 269.4, 63.6, 89.2
-}
-zenflesh.bg_stark = zenflesh.bg.abs_da(3).sa(8)
-zenflesh.bg_warm = hsluv(268.9, 24.5, 13.9) -- base moon
-M.zenflesh = zenflesh
+}, "zenflesh")
 
 return M

lua/zenbones/rosebones/term.lua

@@ -1,51 +0,0 @@
-local palette = require "zenbones.rosebones.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