update build to derive term colors
This commit is contained in:
@@ -27,11 +27,12 @@ colors:
|
||||
white: '${color15}'
|
||||
]]
|
||||
|
||||
return function(name, theme, palette, term)
|
||||
return function(name, specs, p)
|
||||
local term = require("zenbones.term").colors_map(p)
|
||||
local values = {
|
||||
name = name,
|
||||
bg = theme.Normal.bg.hex,
|
||||
fg = theme.Normal.fg.hex,
|
||||
bg = specs.Normal.bg.hex,
|
||||
fg = specs.Normal.fg.hex,
|
||||
}
|
||||
for i, v in ipairs(term) do
|
||||
values["color" .. (i - 1)] = v.hex
|
||||
|
||||
@@ -43,7 +43,8 @@ local function key_to_xml(key, color)
|
||||
return xml
|
||||
end
|
||||
|
||||
return function(name, theme, palette, term)
|
||||
return function(name, specs, p)
|
||||
local term = require("zenbones.term").colors_map(p)
|
||||
local colors = {
|
||||
["Ansi 0"] = term[1],
|
||||
["Ansi 1"] = term[2],
|
||||
@@ -61,17 +62,17 @@ return function(name, theme, palette, term)
|
||||
["Ansi 13"] = term[14],
|
||||
["Ansi 14"] = term[15],
|
||||
["Ansi 15"] = term[16],
|
||||
Foreground = theme.Normal.fg,
|
||||
Background = theme.Normal.bg,
|
||||
Foreground = specs.Normal.fg,
|
||||
Background = specs.Normal.bg,
|
||||
Bold = term[9],
|
||||
Cursor = theme.Cursor.bg,
|
||||
["Cursor Text"] = theme.Cursor.fg,
|
||||
["Cursor Guide"] = theme.CursorLine.bg,
|
||||
Cursor = specs.Cursor.bg,
|
||||
["Cursor Text"] = specs.Cursor.fg,
|
||||
["Cursor Guide"] = specs.CursorLine.bg,
|
||||
Link = term[13],
|
||||
Selection = theme.Visual.bg,
|
||||
["Selected Text"] = theme.Normal.fg,
|
||||
Badge = theme.Comment.fg,
|
||||
Tab = theme.Normal.bg,
|
||||
Selection = specs.Visual.bg,
|
||||
["Selected Text"] = specs.Normal.fg,
|
||||
Badge = specs.Comment.fg,
|
||||
Tab = specs.Normal.bg,
|
||||
}
|
||||
|
||||
local template = start_template
|
||||
|
||||
@@ -40,20 +40,21 @@ color14 ${color14}
|
||||
color15 ${color15}
|
||||
]]
|
||||
|
||||
return function(name, theme, palette, term)
|
||||
local bg = theme.Normal.bg.hex
|
||||
local fg = theme.Normal.fg.hex
|
||||
return function(name, specs, p)
|
||||
local term = require("zenbones.term").colors_map(p)
|
||||
local bg = specs.Normal.bg.hex
|
||||
local fg = specs.Normal.fg.hex
|
||||
local values = {
|
||||
name = name,
|
||||
background = bg,
|
||||
foreground = fg,
|
||||
selection_background = theme.Visual.bg.hex,
|
||||
selection_background = specs.Visual.bg.hex,
|
||||
selection_foreground = fg,
|
||||
url_color = term[13].hex,
|
||||
cursor = fg,
|
||||
active_tab_background = theme.Search.bg.hex,
|
||||
active_tab_background = specs.Search.bg.hex,
|
||||
active_tab_foreground = fg,
|
||||
inactive_tab_background = theme.StatusLine.bg.hex,
|
||||
inactive_tab_background = specs.StatusLine.bg.hex,
|
||||
inactive_tab_foreground = fg,
|
||||
}
|
||||
for i, v in ipairs(term) do
|
||||
|
||||
@@ -23,31 +23,31 @@ let s:p.tabline.tabsel = [ [ "${tabsel_fg}", "${tabsel_bg}", "bold" ] ]
|
||||
let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p)
|
||||
]]
|
||||
|
||||
return function(name, theme, palette, terminal)
|
||||
return function(name, specs, p)
|
||||
return {
|
||||
string.format("autoload/lightline/colorscheme/%s.vim", name),
|
||||
template,
|
||||
{
|
||||
common_fg = theme.Folded.fg.hex,
|
||||
inactive_bg = theme.StatusLineNC.bg.hex,
|
||||
inactive_fg = theme.StatusLineNC.fg.hex,
|
||||
normal_a_bg = theme.PmenuSbar.bg.hex,
|
||||
normal_b_bg = theme.PmenuSel.bg.hex,
|
||||
normal_c_bg = theme.StatusLine.bg.hex,
|
||||
normal_c_fg = theme.StatusLine.fg.hex,
|
||||
insert_a_bg = theme.DiffText.bg.hex,
|
||||
visual_a_bg = theme.Visual.bg.hex,
|
||||
replace_a_bg = theme.DiffDelete.bg.hex,
|
||||
tabline_left_bg = theme.PmenuSel.bg.hex,
|
||||
tabline_left_fg = theme.Normal.fg.hex,
|
||||
tabline_right_bg = theme.PmenuSel.bg.hex,
|
||||
tabline_right_fg = theme.Normal.fg.hex,
|
||||
tabsel_bg = theme.Normal.bg.hex,
|
||||
tabsel_fg = theme.Normal.fg.hex,
|
||||
warning_bg = theme.DiagnosticVirtualTextWarn.bg.hex,
|
||||
warning_fg = theme.DiagnosticVirtualTextWarn.fg.hex,
|
||||
error_bg = theme.LspDiagnosticsVirtualTextError.bg.hex,
|
||||
error_fg = theme.LspDiagnosticsVirtualTextError.fg.hex,
|
||||
common_fg = specs.Folded.fg.hex,
|
||||
inactive_bg = specs.StatusLineNC.bg.hex,
|
||||
inactive_fg = specs.StatusLineNC.fg.hex,
|
||||
normal_a_bg = specs.PmenuSbar.bg.hex,
|
||||
normal_b_bg = specs.PmenuSel.bg.hex,
|
||||
normal_c_bg = specs.StatusLine.bg.hex,
|
||||
normal_c_fg = specs.StatusLine.fg.hex,
|
||||
insert_a_bg = specs.DiffText.bg.hex,
|
||||
visual_a_bg = specs.Visual.bg.hex,
|
||||
replace_a_bg = specs.DiffDelete.bg.hex,
|
||||
tabline_left_bg = specs.PmenuSel.bg.hex,
|
||||
tabline_left_fg = specs.Normal.fg.hex,
|
||||
tabline_right_bg = specs.PmenuSel.bg.hex,
|
||||
tabline_right_fg = specs.Normal.fg.hex,
|
||||
tabsel_bg = specs.Normal.bg.hex,
|
||||
tabsel_fg = specs.Normal.fg.hex,
|
||||
warning_bg = specs.DiagnosticVirtualTextWarn.bg.hex,
|
||||
warning_fg = specs.DiagnosticVirtualTextWarn.fg.hex,
|
||||
error_bg = specs.LspDiagnosticsVirtualTextError.bg.hex,
|
||||
error_fg = specs.LspDiagnosticsVirtualTextError.fg.hex,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
@@ -34,22 +34,22 @@ return {
|
||||
}
|
||||
]]
|
||||
|
||||
return function(name, theme, palette, terminal)
|
||||
return function(name, specs, p)
|
||||
return {
|
||||
string.format("lua/lualine/themes/%s.lua", name),
|
||||
template,
|
||||
{
|
||||
common_fg = theme.Folded.fg.hex,
|
||||
inactive_bg = theme.StatusLineNC.bg.hex,
|
||||
inactive_fg = theme.StatusLineNC.fg.hex,
|
||||
normal_a_bg = theme.PmenuSbar.bg.hex,
|
||||
normal_b_bg = theme.PmenuSel.bg.hex,
|
||||
normal_c_bg = theme.StatusLine.bg.hex,
|
||||
normal_c_fg = theme.StatusLine.fg.hex,
|
||||
insert_a_bg = theme.DiffText.bg.hex,
|
||||
command_a_bg = theme.Search.bg.hex,
|
||||
visual_a_bg = theme.Visual.bg.hex,
|
||||
replace_a_bg = theme.DiffDelete.bg.hex,
|
||||
common_fg = specs.Folded.fg.hex,
|
||||
inactive_bg = specs.StatusLineNC.bg.hex,
|
||||
inactive_fg = specs.StatusLineNC.fg.hex,
|
||||
normal_a_bg = specs.PmenuSbar.bg.hex,
|
||||
normal_b_bg = specs.PmenuSel.bg.hex,
|
||||
normal_c_bg = specs.StatusLine.bg.hex,
|
||||
normal_c_fg = specs.StatusLine.fg.hex,
|
||||
insert_a_bg = specs.DiffText.bg.hex,
|
||||
command_a_bg = specs.Search.bg.hex,
|
||||
visual_a_bg = specs.Visual.bg.hex,
|
||||
replace_a_bg = specs.DiffDelete.bg.hex,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
@@ -18,9 +18,10 @@ set -g clock-mode-colour '${color5}'
|
||||
set -g mode-style fg='${color0}',bg='${selection_background}'
|
||||
]]
|
||||
|
||||
return function(name, theme, palette, term)
|
||||
return function(name, specs, p)
|
||||
local term = require("zenbones.term").colors_map(p)
|
||||
local values = {
|
||||
selection_background = theme.Visual.bg.hex,
|
||||
selection_background = specs.Visual.bg.hex,
|
||||
}
|
||||
for i, v in ipairs(term) do
|
||||
values["color" .. (i - 1)] = v.hex
|
||||
|
||||
@@ -44,14 +44,15 @@ endif
|
||||
]]
|
||||
|
||||
local lush = require "lush"
|
||||
return function(name, theme, palette, term)
|
||||
return function(name, specs, p)
|
||||
local term = require("zenbones.term").colors_map(p)
|
||||
local termcolors = ""
|
||||
for i, v in ipairs(term) do
|
||||
termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex)
|
||||
end
|
||||
|
||||
-- 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(specs, { exclude_keys = { "blend" } })), "\n")
|
||||
|
||||
return {
|
||||
string.format("colors/%s.vim", name),
|
||||
|
||||
@@ -13,18 +13,19 @@ ansi = ["${color0}", "${color1}", "${color2}", "${color3}", "${color4}", "${colo
|
||||
brights = ["${color8}", "${color9}", "${color10}", "${color11}", "${color12}", "${color13}", "${color14}", "${color15}"]
|
||||
]]
|
||||
|
||||
return function(name, theme, palette, term)
|
||||
return function(name, specs, p)
|
||||
local term = require("zenbones.term").colors_map(p)
|
||||
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,
|
||||
cursor_border = theme.Cursor.fg.hex,
|
||||
cursor_fg = theme.Cursor.fg.hex,
|
||||
selection_bg = theme.Visual.bg.hex,
|
||||
selection_fg = theme.Normal.fg.hex,
|
||||
fg = specs.Normal.fg.hex,
|
||||
bg = specs.Normal.bg.hex,
|
||||
cursor_bg = specs.Cursor.bg.hex,
|
||||
cursor_border = specs.Cursor.fg.hex,
|
||||
cursor_fg = specs.Cursor.fg.hex,
|
||||
selection_bg = specs.Visual.bg.hex,
|
||||
selection_fg = specs.Normal.fg.hex,
|
||||
}
|
||||
for i, v in ipairs(term) do
|
||||
values["color" .. (i - 1)] = v.hex
|
||||
|
||||
Reference in New Issue
Block a user