diff --git a/lua/neobones/init.lua b/lua/neobones/init.lua index e5fede7..79e01cf 100644 --- a/lua/neobones/init.lua +++ b/lua/neobones/init.lua @@ -7,7 +7,8 @@ local p = require("neobones.palette")[base_name] -- extend specs using Lush if base_name == "zenbones" then - local specs = require("zenbones.specs").generate(p, util.resolve_config("zenbones")) + local generator = require "zenbones.specs" + local specs = generator.generate(p, generator.get_global_config()) return lush.extends({ specs }).with(function() return { helpHyperTextJump { fg = hsluv "#195174" }, -- --link-color @@ -16,7 +17,8 @@ if base_name == "zenbones" then } end) else - local specs = require("zenflesh.specs").generate(p, util.resolve_config("zenflesh")) + local generator = require "zenflesh.specs" + local specs = generator.generate(p, generator.get_global_config()) return lush.extends({ specs }).with(function() return { FloatBorder { fg = hsluv "#203f57" }, -- --border-color diff --git a/lua/rosebones/init.lua b/lua/rosebones/init.lua index fa9bff6..4b62004 100644 --- a/lua/rosebones/init.lua +++ b/lua/rosebones/init.lua @@ -4,7 +4,8 @@ local util = require "zenbones.util" local base_name = util.bg_to_base_name() local p = require("rosebones.palette")[base_name] -local specs = require(base_name .. ".specs").generate(p, util.resolve_config(base_name)) +local generator = require(base_name .. ".specs") +local specs = generator.generate(p, generator.get_global_config(base_name)) -- extend specs using Lush return lush.extends({ specs }).with(function() diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 920bc61..bd9f9c9 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -1,5 +1,4 @@ -local specs = require "zenbones.specs" +local generator = require "zenbones.specs" local p = require "zenbones.palette" -local config = require("zenbones.util").resolve_config "zenbones" -return specs.generate(p, config) +return generator.generate(p, generator.get_global_config()) diff --git a/lua/zenbones/specs.lua b/lua/zenbones/specs.lua index 46e8245..5129014 100644 --- a/lua/zenbones/specs.lua +++ b/lua/zenbones/specs.lua @@ -2,6 +2,15 @@ local lush = require "lush" local M = {} +function M.get_global_config(base_name) + return { + lightness = vim.g.zenbones_lightness, + comment_gui = vim.g.zenbones_italic_comments ~= false and "italic" or "NONE", + dim_noncurrent_window = vim.g.zenbones_dim_noncurrent_window, + solid_vert_split = vim.g.zenbones_solid_vert_split, + } +end + function M.generate(p, opt) local normal_bg = p.bg local diff_bg_l = 0 diff --git a/lua/zenbones/util.lua b/lua/zenbones/util.lua index f1cb281..161843d 100644 --- a/lua/zenbones/util.lua +++ b/lua/zenbones/util.lua @@ -13,26 +13,6 @@ function M.bg_to_base_name() return vim.opt.background:get() == "light" and "zenbones" or "zenflesh" end -function M.resolve_config(base_name) - if base_name == "zenbones" then - return { - lightness = vim.g.zenbones_lightness, - comment_gui = vim.g.zenbones_italic_comments ~= false and "italic" or "NONE", - dim_noncurrent_window = vim.g.zenbones_dim_noncurrent_window, - solid_vert_split = vim.g.zenbones_solid_vert_split, - } - elseif base_name == "zenflesh" then - return { - darkness = vim.g.zenflesh_darkness, - comment_gui = vim.g.zenflesh_italic_comments ~= false and "italic" or "NONE", - lighten_noncurrent_window = vim.g.zenflesh_lighten_noncurrent_window, - solid_vert_split = vim.g.zenflesh_solid_vert_split, - } - else - error "Unknown base_name" - end -end - function M.palette_extend(p, base_name) if base_name == "zenbones" then p = vim.tbl_extend("keep", p, { diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 82ecf16..584ba5f 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -1,6 +1,4 @@ -local util = require "zenbones.util" -local specs = require "zenflesh.specs" +local generator = require "zenflesh.specs" local p = require "zenflesh.palette" -local config = util.resolve_config "zenflesh" -return specs.generate(p, config) +return generator.generate(p, generator.get_global_config()) diff --git a/lua/zenflesh/specs.lua b/lua/zenflesh/specs.lua index aa23ba1..b6316e4 100644 --- a/lua/zenflesh/specs.lua +++ b/lua/zenflesh/specs.lua @@ -2,6 +2,15 @@ local lush = require "lush" local M = {} +function M.get_global_config(base_name) + return { + darkness = vim.g.zenflesh_darkness, + comment_gui = vim.g.zenflesh_italic_comments ~= false and "italic" or "NONE", + lighten_noncurrent_window = vim.g.zenflesh_lighten_noncurrent_window, + solid_vert_split = vim.g.zenflesh_solid_vert_split, + } +end + function M.generate(p, opt) local normal_bg = p.bg local diff_bg_l = 0