diff --git a/autoload/lightline/colorscheme/zenbones.vim b/autoload/lightline/colorscheme/zenbones.vim index b430919..6977dd7 100644 --- a/autoload/lightline/colorscheme/zenbones.vim +++ b/autoload/lightline/colorscheme/zenbones.vim @@ -1,4 +1,4 @@ -" This file is auto-generated from lua/zenbones/build/lightline.lua +" This file is auto-generated from lua/zenbones/template/lightline.lua let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p.normal.left = [ [ "#564E4A", "#B2A39B", "bold" ], [ "#564E4A", "#C4B6AF" ] ] diff --git a/autoload/lightline/colorscheme/zenflesh.vim b/autoload/lightline/colorscheme/zenflesh.vim index d53c511..a03d417 100644 --- a/autoload/lightline/colorscheme/zenflesh.vim +++ b/autoload/lightline/colorscheme/zenflesh.vim @@ -1,4 +1,4 @@ -" This file is auto-generated from lua/zenbones/build/lightline.lua +" This file is auto-generated from lua/zenbones/template/lightline.lua let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p.normal.left = [ [ "#BBAEA8", "#716965", "bold" ], [ "#BBAEA8", "#4E4845" ] ] diff --git a/colors/zenbones.vim b/colors/zenbones.vim index cf4d188..62ad693 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -1,4 +1,4 @@ -" This file is auto-generated from lua/zenbones/build/vim.lua +" This file is auto-generated from lua/zenbones/template/vim.lua if exists('g:colors_name') highlight clear syntax reset diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index 6d7ea0a..44249bd 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -1,4 +1,4 @@ -" This file is auto-generated from lua/zenbones/build/vim.lua +" This file is auto-generated from lua/zenbones/template/vim.lua if exists('g:colors_name') highlight clear syntax reset diff --git a/extras/alacritty/zenbones.yml b/extras/alacritty/zenbones.yml index 3dd0472..9b907d8 100644 --- a/extras/alacritty/zenbones.yml +++ b/extras/alacritty/zenbones.yml @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/alacritty.lua +# This file is auto-generated from lua/zenbones/template/alacritty.lua # zenbones alacritty colors colors: # Default colors diff --git a/extras/alacritty/zenflesh.yml b/extras/alacritty/zenflesh.yml index 41b2d2c..9735f04 100644 --- a/extras/alacritty/zenflesh.yml +++ b/extras/alacritty/zenflesh.yml @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/alacritty.lua +# This file is auto-generated from lua/zenbones/template/alacritty.lua # zenflesh alacritty colors colors: # Default colors diff --git a/extras/kitty/zenbones.conf b/extras/kitty/zenbones.conf index 41e7f27..c6c9cdb 100644 --- a/extras/kitty/zenbones.conf +++ b/extras/kitty/zenbones.conf @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/kitty.lua +# This file is auto-generated from lua/zenbones/template/kitty.lua # vim:ft=kitty ## name: zenbones ## license: MIT diff --git a/extras/kitty/zenflesh.conf b/extras/kitty/zenflesh.conf index ea0cf07..89ea569 100644 --- a/extras/kitty/zenflesh.conf +++ b/extras/kitty/zenflesh.conf @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/kitty.lua +# This file is auto-generated from lua/zenbones/template/kitty.lua # vim:ft=kitty ## name: zenflesh ## license: MIT diff --git a/extras/tmux/zenbones.tmux b/extras/tmux/zenbones.tmux index e8f640c..6286526 100644 --- a/extras/tmux/zenbones.tmux +++ b/extras/tmux/zenbones.tmux @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/tmux.lua +# This file is auto-generated from lua/zenbones/template/tmux.lua set -g status-left ' #[fg=#88507D,bold]#{s/root//:client_key_table} ' set -g status-right '#[fg=#88507D,bold] [#S]#[fg=#88507D,bold] [%d/%m] #[fg=#88507D,bold][%I:%M%p] ' set -g status-style fg='#88507D',bg='#2C363C' diff --git a/extras/tmux/zenflesh.tmux b/extras/tmux/zenflesh.tmux index 5d55458..47c3c98 100644 --- a/extras/tmux/zenflesh.tmux +++ b/extras/tmux/zenflesh.tmux @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/tmux.lua +# This file is auto-generated from lua/zenbones/template/tmux.lua set -g status-left ' #[fg=#B279A7,bold]#{s/root//:client_key_table} ' set -g status-right '#[fg=#B279A7,bold] [#S]#[fg=#B279A7,bold] [%d/%m] #[fg=#B279A7,bold][%I:%M%p] ' set -g status-style fg='#B279A7',bg='#B4BDC3' diff --git a/extras/wezterm/Zenbones.toml b/extras/wezterm/Zenbones.toml index 3bb517e..afb64a5 100644 --- a/extras/wezterm/Zenbones.toml +++ b/extras/wezterm/Zenbones.toml @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/wezterm.lua +# This file is auto-generated from lua/zenbones/template/wezterm.lua # Zenbones [colors] foreground = "#2C363C" diff --git a/extras/wezterm/Zenflesh.toml b/extras/wezterm/Zenflesh.toml index bf1116c..039e5af 100644 --- a/extras/wezterm/Zenflesh.toml +++ b/extras/wezterm/Zenflesh.toml @@ -1,4 +1,4 @@ -# This file is auto-generated from lua/zenbones/build/wezterm.lua +# This file is auto-generated from lua/zenbones/template/wezterm.lua # Zenflesh [colors] foreground = "#B4BDC3" diff --git a/lua/lualine/themes/zenbones.lua b/lua/lualine/themes/zenbones.lua index dfb72ca..f07c5b1 100644 --- a/lua/lualine/themes/zenbones.lua +++ b/lua/lualine/themes/zenbones.lua @@ -1,4 +1,4 @@ --- This file is auto-generated from lua/zenbones/build/lualine.lua +-- This file is auto-generated from lua/zenbones/template/lualine.lua local common_fg = "#564E4A" local inactive_bg = "#DAD3CF" local inactive_fg = "#596A76" diff --git a/lua/lualine/themes/zenflesh.lua b/lua/lualine/themes/zenflesh.lua index 360e381..b883b78 100644 --- a/lua/lualine/themes/zenflesh.lua +++ b/lua/lualine/themes/zenflesh.lua @@ -1,4 +1,4 @@ --- This file is auto-generated from lua/zenbones/build/lualine.lua +-- This file is auto-generated from lua/zenbones/template/lualine.lua local common_fg = "#BBAEA8" local inactive_bg = "#312D2B" local inactive_fg = "#CAD0D4" diff --git a/lua/zenbones/build.lua b/lua/zenbones/build.lua index e9206dd..4bb11bf 100644 --- a/lua/zenbones/build.lua +++ b/lua/zenbones/build.lua @@ -1,36 +1,10 @@ local util = require "zenbones.util" -local function write_template(path, template, values) - print("[write template] " .. path) - local content = util.interp(template, values) - local file = io.open(path, "w") - file:write(content) - file:close() -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)( - "zenbones", - require "zenbones", - require "zenbones.palette", - require "zenbones.terminal" - ) - ) - ) - write_template( - unpack( - require("zenbones.build." .. t)( - "zenflesh", - require "zenflesh", - require "zenflesh.palette", - require "zenflesh.terminal" - ) - ) - ) + util.build("zenbones", require "zenbones", require "zenbones.palette", require "zenbones.terminal") + util.build("zenflesh", require "zenflesh", require "zenflesh.palette", require "zenflesh.terminal") end end diff --git a/lua/zenbones/build/alacritty.lua b/lua/zenbones/template/alacritty.lua similarity index 97% rename from lua/zenbones/build/alacritty.lua rename to lua/zenbones/template/alacritty.lua index 03d310d..b9177b9 100644 --- a/lua/zenbones/build/alacritty.lua +++ b/lua/zenbones/template/alacritty.lua @@ -1,4 +1,4 @@ -local template = [[# This file is auto-generated from lua/zenbones/build/alacritty.lua +local template = [[# This file is auto-generated from lua/zenbones/template/alacritty.lua # ${name} alacritty colors colors: # Default colors diff --git a/lua/zenbones/build/kitty.lua b/lua/zenbones/template/kitty.lua similarity index 98% rename from lua/zenbones/build/kitty.lua rename to lua/zenbones/template/kitty.lua index 36b8802..71d73e8 100644 --- a/lua/zenbones/build/kitty.lua +++ b/lua/zenbones/template/kitty.lua @@ -1,4 +1,4 @@ -local template = [[# This file is auto-generated from lua/zenbones/build/kitty.lua +local template = [[# This file is auto-generated from lua/zenbones/template/kitty.lua # vim:ft=kitty ## name: ${name} ## license: MIT diff --git a/lua/zenbones/build/lightline.lua b/lua/zenbones/template/lightline.lua similarity index 99% rename from lua/zenbones/build/lightline.lua rename to lua/zenbones/template/lightline.lua index 5d4bb87..d683bb5 100644 --- a/lua/zenbones/build/lightline.lua +++ b/lua/zenbones/template/lightline.lua @@ -1,4 +1,4 @@ -local template = [[" This file is auto-generated from lua/zenbones/build/lightline.lua +local template = [[" This file is auto-generated from lua/zenbones/template/lightline.lua let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p.normal.left = [ [ "${common_fg}", "${normal_a_bg}", "bold" ], [ "${common_fg}", "${normal_b_bg}" ] ] diff --git a/lua/zenbones/build/lualine.lua b/lua/zenbones/template/lualine.lua similarity index 98% rename from lua/zenbones/build/lualine.lua rename to lua/zenbones/template/lualine.lua index ea30ae0..3e1a073 100644 --- a/lua/zenbones/build/lualine.lua +++ b/lua/zenbones/template/lualine.lua @@ -1,4 +1,4 @@ -local template = [[-- This file is auto-generated from lua/zenbones/build/lualine.lua +local template = [[-- This file is auto-generated from lua/zenbones/template/lualine.lua local common_fg = "${common_fg}" local inactive_bg = "${inactive_bg}" local inactive_fg = "${inactive_fg}" diff --git a/lua/zenbones/build/tmux.lua b/lua/zenbones/template/tmux.lua similarity index 97% rename from lua/zenbones/build/tmux.lua rename to lua/zenbones/template/tmux.lua index edce9d6..66b3ce3 100644 --- a/lua/zenbones/build/tmux.lua +++ b/lua/zenbones/template/tmux.lua @@ -1,4 +1,4 @@ -local template = [[# This file is auto-generated from lua/zenbones/build/tmux.lua +local template = [[# This file is auto-generated from lua/zenbones/template/tmux.lua set -g status-left ' #[fg=${color5},bold]#{s/root//:client_key_table} ' set -g status-right '#[fg=${color5},bold] [#S]#[fg=${color5},bold] [%d/%m] #[fg=${color5},bold][%I:%M%p] ' set -g status-style fg='${color5}',bg='${color7}' diff --git a/lua/zenbones/build/vim.lua b/lua/zenbones/template/vim.lua similarity index 98% rename from lua/zenbones/build/vim.lua rename to lua/zenbones/template/vim.lua index 5f40921..c80e78b 100644 --- a/lua/zenbones/build/vim.lua +++ b/lua/zenbones/template/vim.lua @@ -1,6 +1,4 @@ -local lush = require "lush" - -local template = [[" This file is auto-generated from lua/zenbones/build/vim.lua +local template = [[" This file is auto-generated from lua/zenbones/template/vim.lua if exists('g:colors_name') highlight clear syntax reset @@ -35,6 +33,7 @@ endif ${vimcolors} ]] +local lush = require "lush" return function(name, theme, palette, terminal) local termcolors = "" for i, v in ipairs(terminal.colors) do diff --git a/lua/zenbones/build/wezterm.lua b/lua/zenbones/template/wezterm.lua similarity index 97% rename from lua/zenbones/build/wezterm.lua rename to lua/zenbones/template/wezterm.lua index c5b8e9a..8f2ec0d 100644 --- a/lua/zenbones/build/wezterm.lua +++ b/lua/zenbones/template/wezterm.lua @@ -1,4 +1,4 @@ -local template = [[# This file is auto-generated from lua/zenbones/build/wezterm.lua +local template = [[# This file is auto-generated from lua/zenbones/template/wezterm.lua # ${name} [colors] foreground = "${fg}" diff --git a/lua/zenbones/util.lua b/lua/zenbones/util.lua index f2dc4d4..798e7f5 100644 --- a/lua/zenbones/util.lua +++ b/lua/zenbones/util.lua @@ -7,4 +7,23 @@ function M.interp(s, tab) end)) end +function M.bg_to_base_name() + return vim.opt.background:get() == "light" and "zenbones" or "zenflesh" +end + +local function write_template(path, template, values) + print("[write template] " .. path) + local content = M.interp(template, values) + local file = io.open(path, "w") + file:write(content) + file:close() +end + +function M.build(name, specs, palette, terminal) + local templates = { "vim", "kitty", "alacritty", "wezterm", "lualine", "lightline", "tmux" } + for _, t in ipairs(templates) do + write_template(unpack(require("zenbones.template." .. t)(name, specs, palette, terminal))) + end +end + return M