modify build script for zenflesh

lua/zenbones/build.lua

@@ -1,6 +1,3 @@
-local theme = require "zenbones"
-local terminal = require "zenbones.terminal"
-
 -- got from http://lua-users.org/wiki/StringInterpolation
 function interp(s, tab)
 	return (s:gsub("($%b{})", function(w)
@@ -19,7 +16,8 @@ end
 local function build()
 	local templates = { "vim", "kitty", "alacritty", "wezterm", "lualine", "lightline", "tmux" }
 	for _, t in ipairs(templates) do
-		write_template(unpack(require("zenbones.build." .. t)))
+		write_template(unpack(require("zenbones.build." .. t) "zenbones"))
+		write_template(unpack(require("zenbones.build." .. t) "zenflesh"))
 	end
 end
 

lua/zenbones/build/alacritty.lua

@@ -1,4 +1,4 @@
-local template = [[# Zenbones Alacritty Colors
+local template = [[# ${name} alacritty colors
 colors:
   # Default colors
   primary:
@@ -26,15 +26,18 @@ colors:
     white:   '${color15}'
 ]]
 
-local theme = require "zenbones"
+return function(name)
-local terminal = require "zenbones.terminal"
+	local theme = require(name)
+	local terminal = require(name .. ".terminal")
 
-local values = {
+	local values = {
+		name = name,
 		bg = theme.Normal.bg.hex,
 		fg = theme.Normal.fg.hex,
-}
+	}
-for i, v in ipairs(terminal.colors) do
+	for i, v in ipairs(terminal.colors) do
 		values["color" .. (i - 1)] = v.hex
-end
+	end
 
-return { "extras/alacritty/zenbones.yml", template, values }
+	return { string.format("extras/alacritty/%s.yml", name), template, values }
+end

lua/zenbones/build/kitty.lua

@@ -1,8 +1,8 @@
 local template = [[# vim:ft=kitty
-## name: zenbones
+## name: ${name}
 ## license: MIT
 ## author: Michael Chris Lopez
-## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenbones.conf
+## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/${name}.conf
 
 background ${background}
 foreground ${foreground}
@@ -39,12 +39,14 @@ color14 ${color14}
 color15 ${color15}
 ]]
 
-local theme = require "zenbones"
+return function(name)
-local terminal = require "zenbones.terminal"
+	local theme = require(name)
+	local terminal = require(name .. ".terminal")
 
-local bg = theme.Normal.bg.hex
+	local bg = theme.Normal.bg.hex
-local fg = theme.Normal.fg.hex
+	local fg = theme.Normal.fg.hex
-local values = {
+	local values = {
+		name = name,
 		background = bg,
 		foreground = fg,
 		selection_background = theme.Visual.bg.hex,
@@ -55,9 +57,10 @@ local values = {
 		active_tab_foreground = fg,
 		inactive_tab_background = theme.StatusLine.bg.hex,
 		inactive_tab_foreground = fg,
-}
+	}
-for i, v in ipairs(terminal.colors) do
+	for i, v in ipairs(terminal.colors) do
 		values["color" .. (i - 1)] = v.hex
-end
+	end
 
-return { "extras/kitty/zenbones.conf", template, values }
+	return { string.format("extras/kitty/%s.conf", name), template, values }
+end

lua/zenbones/build/lightline.lua

@@ -22,10 +22,11 @@ let s:p.tabline.tabsel = [ [ "${tabsel_fg}", "${tabsel_bg}", "bold" ] ]
 let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p)
 ]]
 
-local theme = require "zenbones"
+return function(name)
+	local theme = require(name)
 
-return {
+	return {
-	"autoload/lightline/colorscheme/zenbones.vim",
+		string.format("autoload/lightline/colorscheme/%s.vim", name),
 		template,
 		{
 			common_fg = theme.Folded.fg.hex,
@@ -49,4 +50,5 @@ return {
 			error_bg = theme.LspDiagnosticsVirtualTextError.bg.hex,
 			error_fg = theme.LspDiagnosticsVirtualTextError.fg.hex,
 		},
-}
+	}
+end

lua/zenbones/build/lualine.lua

@@ -33,10 +33,11 @@ return {
 }
 ]]
 
-local theme = require "zenbones"
+return function(name)
+	local theme = require(name)
 
-return {
+	return {
-	"lua/lualine/themes/zenbones.lua",
+		string.format("lua/lualine/themes/%s.lua", name),
 		template,
 		{
 			common_fg = theme.Folded.fg.hex,
@@ -51,4 +52,5 @@ return {
 			visual_a_bg = theme.Visual.bg.hex,
 			replace_a_bg = theme.DiffDelete.bg.hex,
 		},
-}
+	}
+end

lua/zenbones/build/tmux.lua

@@ -17,14 +17,16 @@ set -g clock-mode-colour '${color5}'
 set -g mode-style fg='${color0}',bg='${selection_background}'
 ]]
 
-local theme = require "zenbones"
+return function(name)
-local terminal = require "zenbones.terminal"
+	local theme = require(name)
+	local terminal = require(name .. ".terminal")
 
-local values = {
+	local values = {
 		selection_background = theme.Visual.bg.hex,
-}
+	}
-for i, v in ipairs(terminal.colors) do
+	for i, v in ipairs(terminal.colors) do
 		values["color" .. (i - 1)] = v.hex
-end
+	end
 
-return { "extras/tmux/zenbones.tmux", template, values }
+	return { string.format("extras/tmux/%s.tmux", name), template, values }
+end

lua/zenbones/build/vim.lua

@@ -1,6 +1,4 @@
 local lush = require "lush"
-local theme = require "zenbones"
-local terminal = require "zenbones.terminal"
 
 local template = [[if exists('g:colors_name')
     highlight clear
@@ -9,7 +7,7 @@ local template = [[if exists('g:colors_name')
 endif
 
 set background=light
-let g:colors_name = 'zenbones'
+let g:colors_name = '${name}'
 
 ${termcolors}
 if has('terminal')
@@ -36,19 +34,24 @@ endif
 ${vimcolors}
 ]]
 
-local termcolors = ""
+return function(name)
-for i, v in ipairs(terminal.colors) do
+    local theme = require(name)
+    local terminal = require(name .. ".terminal")
+    local termcolors = ""
+    for i, v in ipairs(terminal.colors) do
         termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex)
-end
+    end
 
--- Compile lush table, concatenate to a single string, and remove blend property
+    -- Compile lush table, concatenate to a single string, and remove blend property
-local vimcolors = table.concat(vim.fn.sort(lush.compile(theme, { exclude_keys = { "blend" } })), "\n")
+    local vimcolors = table.concat(vim.fn.sort(lush.compile(theme, { exclude_keys = { "blend" } })), "\n")
 
-return {
+    return {
-	"colors/zenbones.vim",
+        string.format("colors/%s.vim", name),
         template,
         {
+            name = name,
             termcolors = termcolors,
             vimcolors = vimcolors,
         },
-}
+    }
+end

lua/zenbones/build/wezterm.lua

@@ -1,4 +1,4 @@
-local template = [[# Zenbones
+local template = [[# ${name}
 [colors]
 foreground = "${fg}"
 background = "${bg}"
@@ -12,10 +12,14 @@ ansi = ["${color0}", "${color1}", "${color2}", "${color3}", "${color4}", "${colo
 brights = ["${color8}", "${color9}", "${color10}", "${color11}", "${color12}", "${color13}", "${color14}", "${color15}"]
 ]]
 
-local theme = require "zenbones"
+return function(name)
-local terminal = require "zenbones.terminal"
+	local theme = require(name)
+	local terminal = require(name .. ".terminal")
 
-local values = {
+	local name = name:sub(1, 1):upper() .. name:sub(2)
+
+	local values = {
+		name = name,
 		fg = theme.Normal.fg.hex,
 		bg = theme.Normal.bg.hex,
 		cursor_bg = theme.Cursor.bg.hex,
@@ -23,9 +27,10 @@ local values = {
 		cursor_fg = theme.Cursor.fg.hex,
 		selection_bg = theme.Visual.bg.hex,
 		selection_fg = theme.Normal.fg.hex,
-}
+	}
-for i, v in ipairs(terminal.colors) do
+	for i, v in ipairs(terminal.colors) do
 		values["color" .. (i - 1)] = v.hex
-end
+	end
 
-return { "extras/wezterm/Zenbones.toml", template, values }
+	return { string.format("extras/wezterm/%s.toml", name), template, values }
+end