rename terminal -> term

colors/rosebones.lua

@@ -9,4 +9,4 @@ local base_name = util.bg_to_base_name()
 -- include our theme file and pass it to lush to apply
 require "lush"(require "zenbones.rosebones")
 
-require("zenbones.rosebones.terminal").setup(base_name)
+require("zenbones.rosebones.term").setup(base_name)

colors/zenbones-lush.lua

@@ -1,7 +1,7 @@
 vim.opt.background = "light"
 vim.g.colors_name = "zenbones-lush"
 
-require("zenbones.terminal").setup()
+require("zenbones.term").setup()
 
 -- By setting our module to nil, we clear lua's cache,
 -- which means the require ahead will *always* occur.

colors/zenbones.vim

@@ -121,7 +121,6 @@ highlight Statement guifg=#2C363C guibg=NONE guisp=NONE gui=bold
 highlight StatusLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=NONE
 highlight StatusLineNC guifg=#596A76 guibg=#DAD3CF guisp=NONE gui=NONE
 highlight TSConstant guifg=#44525B guibg=NONE guisp=NONE gui=bold
-highlight TabLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=italic
 highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold
 highlight TelescopeMatching guifg=#88507D guibg=NONE guisp=NONE gui=bold
 highlight TelescopeSelectionCaret guifg=#A8334C guibg=#E6E1DF guisp=NONE gui=NONE
@@ -212,6 +211,7 @@ highlight! link TSTag Special
 highlight! link TSVariable Identifier
 highlight! link TSVariableBuiltin Number
 highlight! link TSWarning WarningMsg
+highlight! link TabLine StatusLine
 highlight! link TabLineFill StatusLineNC
 highlight! link TelescopeBorder FloatBorder
 highlight! link TelescopeSelection CursorLine

colors/zenflesh-lush.lua

@@ -1,7 +1,7 @@
 vim.opt.background = "dark"
 vim.g.colors_name = "zenflesh-lush"
 
-require("zenflesh.terminal").setup()
+require("zenflesh.term").setup()
 
 -- By setting our module to nil, we clear lua's cache,
 -- which means the require ahead will *always* occur.

colors/zenflesh.vim

@@ -121,7 +121,6 @@ highlight Statement guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold
 highlight StatusLine guifg=#B4BDC3 guibg=#3D3836 guisp=NONE gui=NONE
 highlight StatusLineNC guifg=#CAD0D4 guibg=#312D2B guisp=NONE gui=NONE
 highlight TSConstant guifg=#979FA4 guibg=NONE guisp=NONE gui=bold
-highlight TabLine guifg=#B4BDC3 guibg=#3D3836 guisp=NONE gui=italic
 highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold
 highlight TelescopeMatching guifg=#B279A7 guibg=NONE guisp=NONE gui=bold
 highlight TelescopeSelectionCaret guifg=#DE6E7C guibg=#24211F guisp=NONE gui=NONE
@@ -212,6 +211,7 @@ highlight! link TSTag Special
 highlight! link TSVariable Identifier
 highlight! link TSVariableBuiltin Number
 highlight! link TSWarning WarningMsg
+highlight! link TabLine StatusLine
 highlight! link TabLineFill StatusLineNC
 highlight! link TelescopeBorder FloatBorder
 highlight! link TelescopeSelection CursorLine

doc/zenbones.md

@@ -167,7 +167,7 @@ local specs = lush.extends({ theme }).with(function()
 end)
 
 -- apply terminal colors
-require(base_name .. ".terminal").setup()
+require(base_name .. ".term").setup()
 
 -- include our theme file and pass it to lush to apply
 lush(specs)

doc/zenbones.txt

@@ -193,7 +193,7 @@ contains the following:
     end)
     
     -- apply terminal colors
-    require(base_name .. ".terminal").setup()
+    require(base_name .. ".term").setup()
     
     -- include our theme file and pass it to lush to apply
     lush(specs)

lua/zenbones/build.lua

@@ -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

lua/zenbones/rosebones/term.lua

@@ -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,

lua/zenbones/template/alacritty.lua

@@ -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
 

lua/zenbones/template/iterm.lua

@@ -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,

lua/zenbones/template/kitty.lua

@@ -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
 

lua/zenbones/template/tmux.lua

@@ -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
 

lua/zenbones/template/vim.lua

@@ -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
 

lua/zenbones/template/wezterm.lua

@@ -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