rename terminal -> term

This commit is contained in:
Michael Chris Lopez
2021-10-09 16:27:46 +08:00
parent f6bcb08068
commit 89b9e8cc69
17 changed files with 49 additions and 50 deletions

View File

@@ -2,22 +2,22 @@ local util = require "zenbones.util"
local function reset_base()
package.loaded["zenbones.palette"] = nil
package.loaded["zenbones.terminal"] = nil
package.loaded["zenbones.term"] = nil
package.loaded["zenbones"] = nil
package.loaded["zenflesh.palette"] = nil
package.loaded["zenflesh.terminal"] = nil
package.loaded["zenflesh.term"] = nil
package.loaded["zenflesh"] = nil
package.loaded["zenbones.neovim.palette"] = nil
package.loaded["zenbones.neovim.terminal"] = nil
package.loaded["zenbones.neovim.term"] = nil
package.loaded["zenbones.neovim"] = nil
end
local function build()
-- default
reset_base()
util.build("zenbones", require "zenbones", require "zenbones.palette", require "zenbones.terminal", {})
util.build("zenbones", require "zenbones", require "zenbones.palette", require("zenbones.term").colors, {})
-- bright
reset_base()
@@ -26,7 +26,7 @@ local function build()
"zenbones_bright",
require "zenbones",
require "zenbones.palette",
require "zenbones.terminal",
require("zenbones.term").colors,
{ exclude = { "vim", "lightline", "lualine" } }
)
vim.api.nvim_del_var "zenbones_lightness"
@@ -38,14 +38,14 @@ local function build()
"zenbones_dim",
require "zenbones",
require "zenbones.palette",
require "zenbones.terminal",
require("zenbones.term").colors,
{ exclude = { "vim", "lightline", "lualine" } }
)
vim.api.nvim_del_var "zenbones_lightness"
-- default
reset_base()
util.build("zenflesh", require "zenflesh", require "zenflesh.palette", require "zenflesh.terminal", {})
util.build("zenflesh", require "zenflesh", require "zenflesh.palette", require("zenflesh.term").colors, {})
-- stark
reset_base()
@@ -54,7 +54,7 @@ local function build()
"zenflesh_stark",
require "zenflesh",
require "zenflesh.palette",
require "zenflesh.terminal",
require("zenflesh.term").colors,
{ exclude = { "vim", "lightline", "lualine" } }
)
vim.api.nvim_del_var "zenflesh_darkness"
@@ -66,7 +66,7 @@ local function build()
"zenflesh_warm",
require "zenflesh",
require "zenflesh.palette",
require "zenflesh.terminal",
require("zenflesh.term").colors,
{ exclude = { "vim", "lightline", "lualine" } }
)
vim.api.nvim_del_var "zenflesh_darkness"
@@ -78,7 +78,7 @@ local function build()
"neovim_light",
require "zenbones.neovim",
require "zenbones.neovim.palette",
require "zenbones.neovim.terminal",
require("zenbones.neovim.term").colors.zenbones,
{ exclude = { "vim" } }
)
@@ -89,7 +89,7 @@ local function build()
"neovim_dark",
require "zenbones.neovim",
require "zenbones.neovim.palette",
require "zenbones.neovim.terminal",
require("zenbones.neovim.term").colors.zenflesh,
{ exclude = { "vim" } }
)
end

View File

@@ -1,8 +1,7 @@
local palette = require "zenbones.rosebones.palette"
local M = {}
local M = { colors = {} }
M.colors = {}
local p = palette.zenbones
M.colors.zenbones = {
p.bg,

View File

@@ -27,13 +27,13 @@ colors:
white: '${color15}'
]]
return function(name, theme, palette, terminal)
return function(name, theme, palette, term)
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(term) do
values["color" .. (i - 1)] = v.hex
end

View File

@@ -43,31 +43,31 @@ local function key_to_xml(key, color)
return xml
end
return function(name, theme, palette, terminal)
return function(name, theme, palette, term)
local colors = {
["Ansi 0"] = terminal.colors[1],
["Ansi 1"] = terminal.colors[2],
["Ansi 2"] = terminal.colors[3],
["Ansi 3"] = terminal.colors[4],
["Ansi 4"] = terminal.colors[5],
["Ansi 5"] = terminal.colors[6],
["Ansi 6"] = terminal.colors[7],
["Ansi 7"] = terminal.colors[8],
["Ansi 8"] = terminal.colors[9],
["Ansi 9"] = terminal.colors[10],
["Ansi 10"] = terminal.colors[11],
["Ansi 11"] = terminal.colors[12],
["Ansi 12"] = terminal.colors[13],
["Ansi 13"] = terminal.colors[14],
["Ansi 14"] = terminal.colors[15],
["Ansi 15"] = terminal.colors[16],
["Ansi 0"] = term[1],
["Ansi 1"] = term[2],
["Ansi 2"] = term[3],
["Ansi 3"] = term[4],
["Ansi 4"] = term[5],
["Ansi 5"] = term[6],
["Ansi 6"] = term[7],
["Ansi 7"] = term[8],
["Ansi 8"] = term[9],
["Ansi 9"] = term[10],
["Ansi 10"] = term[11],
["Ansi 11"] = term[12],
["Ansi 12"] = term[13],
["Ansi 13"] = term[14],
["Ansi 14"] = term[15],
["Ansi 15"] = term[16],
Foreground = theme.Normal.fg,
Background = theme.Normal.bg,
Bold = terminal.colors[9],
Bold = term[9],
Cursor = theme.Cursor.bg,
["Cursor Text"] = theme.Cursor.fg,
["Cursor Guide"] = theme.CursorLine.bg,
Link = terminal.colors[13],
Link = term[13],
Selection = theme.Visual.bg,
["Selected Text"] = theme.Normal.fg,
Badge = theme.Comment.fg,

View File

@@ -40,7 +40,7 @@ color14 ${color14}
color15 ${color15}
]]
return function(name, theme, palette, terminal)
return function(name, theme, palette, term)
local bg = theme.Normal.bg.hex
local fg = theme.Normal.fg.hex
local values = {
@@ -49,14 +49,14 @@ return function(name, theme, palette, terminal)
foreground = fg,
selection_background = theme.Visual.bg.hex,
selection_foreground = fg,
url_color = terminal.colors[13].hex,
url_color = term[13].hex,
cursor = fg,
active_tab_background = theme.Search.bg.hex,
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(term) do
values["color" .. (i - 1)] = v.hex
end

View File

@@ -18,11 +18,11 @@ set -g clock-mode-colour '${color5}'
set -g mode-style fg='${color0}',bg='${selection_background}'
]]
return function(name, theme, palette, terminal)
return function(name, theme, palette, term)
local values = {
selection_background = theme.Visual.bg.hex,
}
for i, v in ipairs(terminal.colors) do
for i, v in ipairs(term) do
values["color" .. (i - 1)] = v.hex
end

View File

@@ -34,9 +34,9 @@ ${vimcolors}
]]
local lush = require "lush"
return function(name, theme, palette, terminal)
return function(name, theme, palette, term)
local termcolors = ""
for i, v in ipairs(terminal.colors) do
for i, v in ipairs(term) do
termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex)
end

View File

@@ -13,7 +13,7 @@ ansi = ["${color0}", "${color1}", "${color2}", "${color3}", "${color4}", "${colo
brights = ["${color8}", "${color9}", "${color10}", "${color11}", "${color12}", "${color13}", "${color14}", "${color15}"]
]]
return function(name, theme, palette, terminal)
return function(name, theme, palette, term)
local name = name:sub(1, 1):upper() .. name:sub(2)
local values = {
@@ -26,7 +26,7 @@ return function(name, theme, palette, terminal)
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(term) do
values["color" .. (i - 1)] = v.hex
end