convert neovim to specs generator

lua/lualine/themes/neovim_dark.lua

@@ -1,13 +1,13 @@
 -- This file is auto-generated from lua/zenbones/template/lualine.lua
-local common_fg = "#9FBDD1"
-local inactive_bg = "#1F3441"
-local inactive_fg = "#D6E1DC"
+local common_fg = "#83B4D2"
+local inactive_bg = "#1F2E37"
+local inactive_fg = "#D1E0DA"
 
 return {
 	normal = {
-		a = { bg = "#4B7C9B", fg = common_fg, gui = "bold" },
-		b = { bg = "#33566B", fg = common_fg },
-		c = { bg = "#284253", fg = "#C7D6D0" },
+		a = { bg = "#4F6F82", fg = common_fg, gui = "bold" },
+		b = { bg = "#334A57", fg = common_fg },
+		c = { bg = "#273944", fg = "#C6D5CF" },
 	},
 
 	insert = {
@@ -19,7 +19,7 @@ return {
 	},
 
 	visual = {
-		a = { bg = "#3A4A44", fg = common_fg, gui = "bold" },
+		a = { bg = "#3D413F", fg = common_fg, gui = "bold" },
 	},
 
 	replace = {

lua/lualine/themes/neovim_light.lua

@@ -1,13 +1,13 @@
 -- This file is auto-generated from lua/zenbones/template/lualine.lua
-local common_fg = "#46624A"
-local inactive_bg = "#CCDBCE"
-local inactive_fg = "#597F43"
+local common_fg = "#4A4F4A"
+local inactive_bg = "#C8D5C9"
+local inactive_fg = "#4B663C"
 
 return {
 	normal = {
-		a = { bg = "#9AB79E", fg = common_fg, gui = "bold" },
-		b = { bg = "#B1C8B5", fg = common_fg },
-		c = { bg = "#C0D3C3", fg = "#212F19" },
+		a = { bg = "#9BA69D", fg = common_fg, gui = "bold" },
+		b = { bg = "#ADB9AF", fg = common_fg },
+		c = { bg = "#BDCABF", fg = "#202E18" },
 	},
 
 	insert = {
@@ -19,7 +19,7 @@ return {
 	},
 
 	visual = {
-		a = { bg = "#D8E6D0", fg = common_fg, gui = "bold" },
+		a = { bg = "#B1EA90", fg = common_fg, gui = "bold" },
 	},
 
 	replace = {

lua/zenbones/neovim/init.lua

@@ -1,30 +1,28 @@
 local lush = require "lush"
-local hsl = lush.hsl
+local util = require "zenbones.util"
+local hsluv = lush.hsluv
 
--- modify base palette (before requiring specs)
-local palette = require "zenbones.neovim.palette"
+local base_name = util.bg_to_base_name()
+local p = require("zenbones.neovim.palette")[base_name]
+
+local specs = require(base_name .. ".specs").generate(p, util.resolve_config(base_name))
 
 -- extend specs using Lush
-local base_name = require("zenbones.util").bg_to_base_name()
-local theme = require(base_name)
-local specs
 if base_name == "zenbones" then
-	specs = lush.extends({ theme }).with(function()
+	return lush.extends({ specs }).with(function()
 		return {
-			helpHyperTextJump { fg = hsl "#195174" }, -- --link-color
+			helpHyperTextJump { fg = hsluv "#195174" }, -- --link-color
 			helpOption { helpHyperTextJump },
 			markdownUrl { helpHyperTextJump },
 		}
 	end)
 else
-	specs = lush.extends({ theme }).with(function()
+	return lush.extends({ specs }).with(function()
 		return {
-			FloatBorder { fg = hsl "#203f57" }, -- --border-color
-			helpHyperTextJump { fg = hsl "#8ec77e" }, -- --link-color
+			FloatBorder { fg = hsluv "#203f57" }, -- --border-color
+			helpHyperTextJump { fg = hsluv "#8ec77e" }, -- --link-color
 			helpOption { helpHyperTextJump },
 			markdownUrl { helpHyperTextJump },
 		}
 	end)
 end
-
-return specs

lua/zenbones/neovim/palette.lua

@@ -1,18 +1,21 @@
 local lush = require "lush"
-local hsl = lush.hsl
+local hsluv = lush.hsluv
 
-local base_name = require("zenbones.util").bg_to_base_name()
-local palette = require(base_name .. ".palette")
+local M = {}
 
-if base_name == "zenbones" then
-	-- palette.bg = hsl "#d3e4db" -- --accent-bg-color
-	palette.bg = hsl "#e7eee8" -- --bg-color
-	palette.fg = hsl "#202e18" -- --accent-color
-	palette.leaf = palette.leaf.sa(24).li(8) -- need to make green more prominent
-else
-	palette.bg = hsl "#0f191f" -- --bg-color
-	palette.fg = hsl "#c7d6d0" -- --fg-color
-	palette.leaf = hsl "#8fff6d" -- --accent-color
-end
+local zenbones = vim.tbl_extend("keep", {
+	-- 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
+}, require "zenbones.palette")
+M.zenbones = zenbones
 
-return palette
+local zenflesh = vim.tbl_extend("keep", {
+	bg = hsluv "#0f191f", -- --bg-color
+	fg = hsluv "#c7d6d0", -- --fg-color
+	leaf = hsluv "#8fff6d", -- --accent-color
+}, require "zenflesh.palette")
+M.zenflesh = zenflesh
+
+return M

lua/zenbones/neovim/term.lua

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

lua/zenbones/neovim/terminal.lua

@@ -1 +0,0 @@
-return require(require("zenbones.util").bg_to_base_name() .. ".terminal")