diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 336e69b..2759d7d 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -14,7 +14,7 @@ jobs: pull-requests: write env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - STYLUA_VERSION: 0.11.0 + STYLUA_VERSION: 0.11.2 steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 diff --git a/README.md b/README.md index d0b1efb..bf3363f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Zenbones -Zenbones is a collection of Vim/Neovim colorschemes designed to highlight code -using contrasts and font variations. Colors are tasked only for other roles such -as diagnostics, diffs, search matches. +A collection of Vim/Neovim colorschemes designed to highlight code using +contrasts and font variations. Colors are tasked only for other roles such as +diagnostics, diffs, search matches. It is carefully crafted for extensibility. You can [create your own zenbones-based colorscheme](doc/zenbones.md#create-your-own-colorscheme) diff --git a/colors/randombones.lua b/colors/randombones.lua index 2c0a916..a419c02 100644 --- a/colors/randombones.lua +++ b/colors/randombones.lua @@ -4,7 +4,8 @@ end vim.g.colors_name = "randombones" -local colorschemes = vim.fn.json_decode(vim.fn.readfile(vim.fn.expand ":h:h" .. "/colorschemes.json")) +local util = require "zenbones.util" +local colorschemes = util.get_colorscheme_list() math.randomseed(os.time()) local index = math.random(#colorschemes) @@ -16,4 +17,4 @@ if colorscheme.background then vim.opt.background = colorscheme.background end -require("zenbones.util").apply_colorscheme() +util.apply_colorscheme() diff --git a/colorschemes.json b/colorschemes.json index 5cf9756..994c964 100644 --- a/colorschemes.json +++ b/colorschemes.json @@ -1,26 +1,54 @@ [ - { "name": "zenbones" }, - { "name": "neobones" }, - { "name": "vimbones", "background": "light" }, + { + "name": "zenbones", + "description": "A contrast-based colorscheme." + }, + { + "name": "neobones", + "description": "A zenbones variant inspired by neovim.io." + }, + { + "name": "vimbones", + "background": "light", + "description": "A zenbones variant inspired by vim.org." + }, { "name": "forestbones", - "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"] + "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"], + "description": "A zenbones variant inspired by Everforest." }, { "name": "nordbones", "background": "dark", - "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"] + "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"], + "description": "A zenbones variant inspired by Nord." }, { "name": "rosebones", - "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"] + "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"], + "description": "A zenbones variant inspired by Rosé Pine." }, { "name": "tokyobones", - "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"] + "exclude": ["iterm", "alacritty", "kitty", "wezterm", "tmux"], + "description": "A zenbones variant inspired by Tokyo Night." }, - { "name": "seoulbones" }, - { "name": "duckbones", "background": "dark" }, - { "name": "zenburned", "background": "dark" }, - { "name": "zenwritten" } + { + "name": "seoulbones", + "description": "A zenbones variant inspired by Seoul256." + }, + { + "name": "duckbones", + "background": "dark", + "description": "A zenbones variant inspired by Spaceduck." + }, + { + "name": "zenburned", + "background": "dark", + "description": "A zenbones variant inspired by Zenburn." + }, + { + "name": "zenwritten", + "description": "A zenbones variant with zero hue and saturation." + } ] diff --git a/doc/zenbones.md b/doc/zenbones.md index 9d3dc20..c18f8dd 100644 --- a/doc/zenbones.md +++ b/doc/zenbones.md @@ -1,8 +1,7 @@ # Documentation -Zenbones is a collection of Vim/Neovim colorschemes designed to highlight code -using contrasts and font variations. Colors are tasked only for other roles such -as diagnostics, diffs, search matches. +A collection of Vim/Neovim colorschemes designed to highlight code using +contrasts and font variations. ## Usage diff --git a/lua/lualine/themes/duckbones.lua b/lua/lualine/themes/duckbones.lua index 0cc8f01..6238970 100644 --- a/lua/lualine/themes/duckbones.lua +++ b/lua/lualine/themes/duckbones.lua @@ -1,34 +1 @@ --- This file is auto-generated by shipwright.nvim -local common_fg = "#9A9FBC" -local inactive_bg = "#222536" -local inactive_fg = "#F0F5C4" - -return { - normal = { - a = { bg = "#5C6489", fg = common_fg, gui = "bold" }, - b = { bg = "#3C415B", fg = common_fg }, - c = { bg = "#2B2F44", fg = "#EBEFC0" }, - }, - - insert = { - a = { bg = "#2A3E48", fg = common_fg, gui = "bold" }, - }, - - command = { - a = { bg = "#4D3191", fg = common_fg, gui = "bold" }, - }, - - visual = { - a = { bg = "#37382D", fg = common_fg, gui = "bold" }, - }, - - replace = { - a = { bg = "#311C1A", fg = common_fg, gui = "bold" }, - }, - - inactive = { - a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, - b = { bg = inactive_bg, fg = inactive_fg }, - c = { bg = inactive_bg, fg = inactive_fg }, - }, -} +return require("zenbones.util").get_lualine_theme("duckbones") diff --git a/lua/lualine/themes/duckbones_default.lua b/lua/lualine/themes/duckbones_default.lua new file mode 100644 index 0000000..ab180e3 --- /dev/null +++ b/lua/lualine/themes/duckbones_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#9A9FBC" +local inactive_bg = "#1A1D2B" +local inactive_fg = "#F0F5C4" + +return { + normal = { + a = { bg = "#585F83", fg = common_fg, gui = "bold" }, + b = { bg = "#383C55", fg = common_fg }, + c = { bg = "#232738", fg = "#EBEFC0" }, + }, + + insert = { + a = { bg = "#2A3E48", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#4D3191", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#37382D", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#311C1A", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/duckbones_stark.lua b/lua/lualine/themes/duckbones_stark.lua new file mode 100644 index 0000000..d6584c9 --- /dev/null +++ b/lua/lualine/themes/duckbones_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#969CC0" +local inactive_bg = "#141726" +local inactive_fg = "#F0F5C4" + +return { + normal = { + a = { bg = "#515A83", fg = common_fg, gui = "bold" }, + b = { bg = "#323854", fg = common_fg }, + c = { bg = "#1F2336", fg = "#EBEFC0" }, + }, + + insert = { + a = { bg = "#253740", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#452C84", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#303128", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#291715", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/duckbones_warm.lua b/lua/lualine/themes/duckbones_warm.lua new file mode 100644 index 0000000..cb5d259 --- /dev/null +++ b/lua/lualine/themes/duckbones_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#9EA2BB" +local inactive_bg = "#202331" +local inactive_fg = "#F0F5C4" + +return { + normal = { + a = { bg = "#5D6486", fg = common_fg, gui = "bold" }, + b = { bg = "#3C4158", fg = common_fg }, + c = { bg = "#2A2D3F", fg = "#EBEFC0" }, + }, + + insert = { + a = { bg = "#304550", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#55369F", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#3D3F33", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#3A2120", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/forestbones.lua b/lua/lualine/themes/forestbones.lua index de9a323..c947bcd 100644 --- a/lua/lualine/themes/forestbones.lua +++ b/lua/lualine/themes/forestbones.lua @@ -1 +1 @@ -return require("lualine.themes.forestbones_" .. vim.opt.background:get()) +return require("zenbones.util").get_lualine_theme("forestbones") diff --git a/lua/lualine/themes/forestbones_dark_default.lua b/lua/lualine/themes/forestbones_dark_default.lua new file mode 100644 index 0000000..94d3448 --- /dev/null +++ b/lua/lualine/themes/forestbones_dark_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#9CB4C6" +local inactive_bg = "#353F46" +local inactive_fg = "#EDE5D4" + +return { + normal = { + a = { bg = "#6B7C89", fg = common_fg, gui = "bold" }, + b = { bg = "#4E5B65", fg = common_fg }, + c = { bg = "#3E4850", fg = "#E7DCC4" }, + }, + + insert = { + a = { bg = "#456763", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#9E5179", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#615B51", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#643839", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/forestbones_dark_stark.lua b/lua/lualine/themes/forestbones_dark_stark.lua new file mode 100644 index 0000000..92555a2 --- /dev/null +++ b/lua/lualine/themes/forestbones_dark_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#92AFC4" +local inactive_bg = "#2D3840" +local inactive_fg = "#EDE5D4" + +return { + normal = { + a = { bg = "#637786", fg = common_fg, gui = "bold" }, + b = { bg = "#475762", fg = common_fg }, + c = { bg = "#37444D", fg = "#E7DCC4" }, + }, + + insert = { + a = { bg = "#3F5F5B", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#934B71", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#59544A", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#5B3233", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/forestbones_dark_warm.lua b/lua/lualine/themes/forestbones_dark_warm.lua new file mode 100644 index 0000000..678feb4 --- /dev/null +++ b/lua/lualine/themes/forestbones_dark_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A1B6C6" +local inactive_bg = "#3D464D" +local inactive_fg = "#EDE5D4" + +return { + normal = { + a = { bg = "#71818D", fg = common_fg, gui = "bold" }, + b = { bg = "#56626C", fg = common_fg }, + c = { bg = "#454F57", fg = "#E7DCC4" }, + }, + + insert = { + a = { bg = "#4A6F6A", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#A95782", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#686357", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#6E3E3F", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/forestbones_light_bright.lua b/lua/lualine/themes/forestbones_light_bright.lua new file mode 100644 index 0000000..eac7abb --- /dev/null +++ b/lua/lualine/themes/forestbones_light_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#5D5436" +local inactive_bg = "#F3DF9B" +local inactive_fg = "#758690" + +return { + normal = { + a = { bg = "#BEAD74", fg = common_fg, gui = "bold" }, + b = { bg = "#D5C383", fg = common_fg }, + c = { bg = "#E7D48E", fg = "#4F5B62" }, + }, + + insert = { + a = { bg = "#BBCBDA", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#F1C5E0", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#DEE7EC", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#F3E9E8", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/forestbones_light_default.lua b/lua/lualine/themes/forestbones_light_default.lua new file mode 100644 index 0000000..ce2e87e --- /dev/null +++ b/lua/lualine/themes/forestbones_light_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#5A5236" +local inactive_bg = "#E9D795" +local inactive_fg = "#758690" + +return { + normal = { + a = { bg = "#B7A874", fg = common_fg, gui = "bold" }, + b = { bg = "#CFBE83", fg = common_fg }, + c = { bg = "#E0CE8F", fg = "#4F5B62" }, + }, + + insert = { + a = { bg = "#B0C3D4", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#EEBADB", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#D3DFE6", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EEDFDF", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/forestbones_light_dim.lua b/lua/lualine/themes/forestbones_light_dim.lua new file mode 100644 index 0000000..9bee4a6 --- /dev/null +++ b/lua/lualine/themes/forestbones_light_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#544D37" +local inactive_bg = "#E2D199" +local inactive_fg = "#758690" + +return { + normal = { + a = { bg = "#B0A377", fg = common_fg, gui = "bold" }, + b = { bg = "#C4B685", fg = common_fg }, + c = { bg = "#D6C691", fg = "#4F5B62" }, + }, + + insert = { + a = { bg = "#A6BBCF", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#ECAFD5", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#C8D7DF", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EAD5D5", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/neobones.lua b/lua/lualine/themes/neobones.lua index 2494baa..64a463c 100644 --- a/lua/lualine/themes/neobones.lua +++ b/lua/lualine/themes/neobones.lua @@ -1 +1 @@ -return require("lualine.themes.neobones_" .. vim.opt.background:get()) +return require("zenbones.util").get_lualine_theme("neobones") diff --git a/lua/lualine/themes/neobones_dark_default.lua b/lua/lualine/themes/neobones_dark_default.lua new file mode 100644 index 0000000..05be28f --- /dev/null +++ b/lua/lualine/themes/neobones_dark_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#7BA9C5" +local inactive_bg = "#18252D" +local inactive_fg = "#D1E0DA" + +return { + normal = { + a = { bg = "#4B697C", fg = common_fg, gui = "bold" }, + b = { bg = "#304552", fg = common_fg }, + c = { bg = "#20303A", fg = "#C6D5CF" }, + }, + + insert = { + a = { bg = "#343F6D", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#62415B", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#3A3E3D", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#3B2023", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/neobones_dark_stark.lua b/lua/lualine/themes/neobones_dark_stark.lua new file mode 100644 index 0000000..de391fa --- /dev/null +++ b/lua/lualine/themes/neobones_dark_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#74A7C5" +local inactive_bg = "#121F27" +local inactive_fg = "#D1E0DA" + +return { + normal = { + a = { bg = "#456578", fg = common_fg, gui = "bold" }, + b = { bg = "#2A404D", fg = common_fg }, + c = { bg = "#1A2A33", fg = "#C6D5CF" }, + }, + + insert = { + a = { bg = "#2F3963", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#593B53", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#343836", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#331B1D", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/neobones_dark_warm.lua b/lua/lualine/themes/neobones_dark_warm.lua new file mode 100644 index 0000000..a89677f --- /dev/null +++ b/lua/lualine/themes/neobones_dark_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#83ABC4" +local inactive_bg = "#1D2931" +local inactive_fg = "#D1E0DA" + +return { + normal = { + a = { bg = "#536E7F", fg = common_fg, gui = "bold" }, + b = { bg = "#384C58", fg = common_fg }, + c = { bg = "#283740", fg = "#C6D5CF" }, + }, + + insert = { + a = { bg = "#3A4678", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#6B4763", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#414544", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#442529", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/neobones_light_bright.lua b/lua/lualine/themes/neobones_light_bright.lua new file mode 100644 index 0000000..cfb4e40 --- /dev/null +++ b/lua/lualine/themes/neobones_light_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#4C554D" +local inactive_bg = "#C7DDCA" +local inactive_fg = "#4B663C" + +return { + normal = { + a = { bg = "#9CAD9E", fg = common_fg, gui = "bold" }, + b = { bg = "#B0C3B3", fg = common_fg }, + c = { bg = "#BFD4C2", fg = "#202E18" }, + }, + + insert = { + a = { bg = "#B0C3D4", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#E1BFD9", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#B4ED92", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EEDFE0", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/neobones_light_default.lua b/lua/lualine/themes/neobones_light_default.lua new file mode 100644 index 0000000..0b28fc0 --- /dev/null +++ b/lua/lualine/themes/neobones_light_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#4A4F4A" +local inactive_bg = "#C8D5C9" +local inactive_fg = "#4B663C" + +return { + normal = { + a = { bg = "#9BA69D", fg = common_fg, gui = "bold" }, + b = { bg = "#ADB9AF", fg = common_fg }, + c = { bg = "#BDCABF", fg = "#202E18" }, + }, + + insert = { + a = { bg = "#A6BBCF", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#DCB5D4", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#ADE48C", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EAD5D7", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/neobones_light_dim.lua b/lua/lualine/themes/neobones_light_dim.lua new file mode 100644 index 0000000..108f4e4 --- /dev/null +++ b/lua/lualine/themes/neobones_light_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#484D48" +local inactive_bg = "#C1CCC2" +local inactive_fg = "#4B663C" + +return { + normal = { + a = { bg = "#97A098", fg = common_fg, gui = "bold" }, + b = { bg = "#A9B3AA", fg = common_fg }, + c = { bg = "#B6C1B8", fg = "#202E18" }, + }, + + insert = { + a = { bg = "#9BB4C9", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#D8ABCE", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#A6DB86", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#E5CBCE", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/nordbones.lua b/lua/lualine/themes/nordbones.lua index 4ed2a50..643c7de 100644 --- a/lua/lualine/themes/nordbones.lua +++ b/lua/lualine/themes/nordbones.lua @@ -1,34 +1 @@ --- This file is auto-generated by shipwright.nvim -local common_fg = "#A8B1C5" -local inactive_bg = "#414959" -local inactive_fg = "#F2F4F7" - -return { - normal = { - a = { bg = "#727F98", fg = common_fg, gui = "bold" }, - b = { bg = "#576175", fg = common_fg }, - c = { bg = "#485061", fg = "#EBEEF3" }, - }, - - insert = { - a = { bg = "#476968", fg = common_fg, gui = "bold" }, - }, - - command = { - a = { bg = "#84637E", fg = common_fg, gui = "bold" }, - }, - - visual = { - a = { bg = "#545F70", fg = common_fg, gui = "bold" }, - }, - - replace = { - a = { bg = "#663A3E", fg = common_fg, gui = "bold" }, - }, - - inactive = { - a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, - b = { bg = inactive_bg, fg = inactive_fg }, - c = { bg = inactive_bg, fg = inactive_fg }, - }, -} +return require("zenbones.util").get_lualine_theme("nordbones") diff --git a/lua/lualine/themes/nordbones_default.lua b/lua/lualine/themes/nordbones_default.lua new file mode 100644 index 0000000..e54fc4a --- /dev/null +++ b/lua/lualine/themes/nordbones_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A8B1C5" +local inactive_bg = "#39404E" +local inactive_fg = "#F2F4F7" + +return { + normal = { + a = { bg = "#707C95", fg = common_fg, gui = "bold" }, + b = { bg = "#535C6F", fg = common_fg }, + c = { bg = "#414959", fg = "#EBEEF3" }, + }, + + insert = { + a = { bg = "#476968", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#84637E", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#545F70", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#663A3E", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/nordbones_stark.lua b/lua/lualine/themes/nordbones_stark.lua new file mode 100644 index 0000000..32880d2 --- /dev/null +++ b/lua/lualine/themes/nordbones_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A2AEC8" +local inactive_bg = "#313949" +local inactive_fg = "#F2F4F7" + +return { + normal = { + a = { bg = "#687795", fg = common_fg, gui = "bold" }, + b = { bg = "#4C576E", fg = common_fg }, + c = { bg = "#3B4557", fg = "#EBEEF3" }, + }, + + insert = { + a = { bg = "#426261", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#7B5C76", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#4D5867", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#5D3438", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/nordbones_warm.lua b/lua/lualine/themes/nordbones_warm.lua new file mode 100644 index 0000000..a29ad2a --- /dev/null +++ b/lua/lualine/themes/nordbones_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#ACB3C5" +local inactive_bg = "#404754" +local inactive_fg = "#F2F4F7" + +return { + normal = { + a = { bg = "#768198", fg = common_fg, gui = "bold" }, + b = { bg = "#5B6376", fg = common_fg }, + c = { bg = "#49505F", fg = "#EBEEF3" }, + }, + + insert = { + a = { bg = "#4D7170", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#8D6987", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#5B6678", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#704044", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/randombones.lua b/lua/lualine/themes/randombones.lua index a887119..7b624c7 100644 --- a/lua/lualine/themes/randombones.lua +++ b/lua/lualine/themes/randombones.lua @@ -1 +1 @@ -return require("lualine.themes." .. vim.g.randombones_colors_name) +return require("zenbones.util").get_lualine_theme(vim.g.randombones_colors_name) diff --git a/lua/lualine/themes/rosebones.lua b/lua/lualine/themes/rosebones.lua index 6d4dd90..b1d2dcc 100644 --- a/lua/lualine/themes/rosebones.lua +++ b/lua/lualine/themes/rosebones.lua @@ -1 +1 @@ -return require("lualine.themes.rosebones_" .. vim.opt.background:get()) +return require("zenbones.util").get_lualine_theme("rosebones") diff --git a/lua/lualine/themes/rosebones_dark_default.lua b/lua/lualine/themes/rosebones_dark_default.lua new file mode 100644 index 0000000..ca60aae --- /dev/null +++ b/lua/lualine/themes/rosebones_dark_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A4A1B7" +local inactive_bg = "#242232" +local inactive_fg = "#E9E0E0" + +return { + normal = { + a = { bg = "#696485", fg = common_fg, gui = "bold" }, + b = { bg = "#45415D", fg = common_fg }, + c = { bg = "#312E43", fg = "#E1D4D4" }, + }, + + insert = { + a = { bg = "#30484C", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#673592", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#523A39", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#3D2229", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/rosebones_dark_stark.lua b/lua/lualine/themes/rosebones_dark_stark.lua new file mode 100644 index 0000000..fc71b90 --- /dev/null +++ b/lua/lualine/themes/rosebones_dark_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A19DBA" +local inactive_bg = "#201D31" +local inactive_fg = "#E9E0E0" + +return { + normal = { + a = { bg = "#645E89", fg = common_fg, gui = "bold" }, + b = { bg = "#413C5D", fg = common_fg }, + c = { bg = "#2B273F", fg = "#E1D4D4" }, + }, + + insert = { + a = { bg = "#2B4145", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#5E3086", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#4A3432", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#341D23", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/rosebones_dark_warm.lua b/lua/lualine/themes/rosebones_dark_warm.lua new file mode 100644 index 0000000..6d64d3a --- /dev/null +++ b/lua/lualine/themes/rosebones_dark_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A8A6BF" +local inactive_bg = "#2E2B45" +local inactive_fg = "#E9E0E0" + +return { + normal = { + a = { bg = "#6F6B93", fg = common_fg, gui = "bold" }, + b = { bg = "#4D4971", fg = common_fg }, + c = { bg = "#393654", fg = "#E1D4D4" }, + }, + + insert = { + a = { bg = "#395459", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#763EA7", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#604443", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#4B2C33", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/rosebones_light_bright.lua b/lua/lualine/themes/rosebones_light_bright.lua new file mode 100644 index 0000000..b7d7128 --- /dev/null +++ b/lua/lualine/themes/rosebones_light_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#635237" +local inactive_bg = "#F3E0C8" +local inactive_fg = "#AE6966" + +return { + normal = { + a = { bg = "#CDAC78", fg = common_fg, gui = "bold" }, + b = { bg = "#E6C188", fg = common_fg }, + c = { bg = "#EED3AE", fg = "#724341" }, + }, + + insert = { + a = { bg = "#AFD2DA", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#D8D2E1", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#F0E6E6", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#F5ECEE", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/rosebones_light_default.lua b/lua/lualine/themes/rosebones_light_default.lua new file mode 100644 index 0000000..9410b68 --- /dev/null +++ b/lua/lualine/themes/rosebones_light_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#605038" +local inactive_bg = "#EED7B7" +local inactive_fg = "#AE6966" + +return { + normal = { + a = { bg = "#C5A778", fg = common_fg, gui = "bold" }, + b = { bg = "#DEBC88", fg = common_fg }, + c = { bg = "#EACA9B", fg = "#724341" }, + }, + + insert = { + a = { bg = "#A8C9D1", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#D1C9DC", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#EADDDC", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#F0E2E5", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/rosebones_light_dim.lua b/lua/lualine/themes/rosebones_light_dim.lua new file mode 100644 index 0000000..561dd08 --- /dev/null +++ b/lua/lualine/themes/rosebones_light_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#5C4E3A" +local inactive_bg = "#EAD1AF" +local inactive_fg = "#AE6966" + +return { + normal = { + a = { bg = "#BCA27B", fg = common_fg, gui = "bold" }, + b = { bg = "#D2B489", fg = common_fg }, + c = { bg = "#E4C596", fg = "#724341" }, + }, + + insert = { + a = { bg = "#A1C1C8", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#CAC0D6", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#E5D3D2", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EBD8DC", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/seoulbones.lua b/lua/lualine/themes/seoulbones.lua index e21a330..67686a2 100644 --- a/lua/lualine/themes/seoulbones.lua +++ b/lua/lualine/themes/seoulbones.lua @@ -1 +1 @@ -return require("lualine.themes.seoulbones_" .. vim.opt.background:get()) +return require("zenbones.util").get_lualine_theme("seoulbones") diff --git a/lua/lualine/themes/seoulbones_dark_default.lua b/lua/lualine/themes/seoulbones_dark_default.lua new file mode 100644 index 0000000..5a58e58 --- /dev/null +++ b/lua/lualine/themes/seoulbones_dark_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#BBBBBB" +local inactive_bg = "#555555" +local inactive_fg = "#E5E5E5" + +return { + normal = { + a = { bg = "#8B8B8B", fg = common_fg, gui = "bold" }, + b = { bg = "#6F6F6F", fg = common_fg }, + c = { bg = "#5E5E5E", fg = "#DDDDDD" }, + }, + + insert = { + a = { bg = "#5D809B", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#8283AD", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#777777", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#82505E", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/seoulbones_dark_stark.lua b/lua/lualine/themes/seoulbones_dark_stark.lua new file mode 100644 index 0000000..09115fd --- /dev/null +++ b/lua/lualine/themes/seoulbones_dark_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#BDB4B5" +local inactive_bg = "#574A4D" +local inactive_fg = "#E5E5E5" + +return { + normal = { + a = { bg = "#958285", fg = common_fg, gui = "bold" }, + b = { bg = "#776669", fg = common_fg }, + c = { bg = "#655658", fg = "#DDDDDD" }, + }, + + insert = { + a = { bg = "#577892", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#7A7BA7", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#6F6F6F", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#784A57", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/seoulbones_dark_warm.lua b/lua/lualine/themes/seoulbones_dark_warm.lua new file mode 100644 index 0000000..d857d6d --- /dev/null +++ b/lua/lualine/themes/seoulbones_dark_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#BEBEBE" +local inactive_bg = "#5C5C5C" +local inactive_fg = "#E5E5E5" + +return { + normal = { + a = { bg = "#919191", fg = common_fg, gui = "bold" }, + b = { bg = "#747474", fg = common_fg }, + c = { bg = "#666666", fg = "#DDDDDD" }, + }, + + insert = { + a = { bg = "#6388A5", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#8A8BB2", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#7F7F7F", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#8B5666", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/seoulbones_light_bright.lua b/lua/lualine/themes/seoulbones_light_bright.lua new file mode 100644 index 0000000..a24ad0e --- /dev/null +++ b/lua/lualine/themes/seoulbones_light_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#554B4D" +local inactive_bg = "#D5D1D1" +local inactive_fg = "#818181" + +return { + normal = { + a = { bg = "#AAA1A2", fg = common_fg, gui = "bold" }, + b = { bg = "#BBB4B5", fg = common_fg }, + c = { bg = "#CAC5C6", fg = "#555555" }, + }, + + insert = { + a = { bg = "#A0BDCC", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#D1BAD0", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#D4D4D4", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EAD5DA", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/seoulbones_light_default.lua b/lua/lualine/themes/seoulbones_light_default.lua new file mode 100644 index 0000000..caa7969 --- /dev/null +++ b/lua/lualine/themes/seoulbones_light_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#4B4B4B" +local inactive_bg = "#C9C9C9" +local inactive_fg = "#818181" + +return { + normal = { + a = { bg = "#9E9E9E", fg = common_fg, gui = "bold" }, + b = { bg = "#B0B0B0", fg = common_fg }, + c = { bg = "#BEBEBE", fg = "#555555" }, + }, + + insert = { + a = { bg = "#99B5C3", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#CBB1CA", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#CCCCCC", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#E5CBD1", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/seoulbones_light_dim.lua b/lua/lualine/themes/seoulbones_light_dim.lua new file mode 100644 index 0000000..80c77e0 --- /dev/null +++ b/lua/lualine/themes/seoulbones_light_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#494949" +local inactive_bg = "#C1C1C1" +local inactive_fg = "#818181" + +return { + normal = { + a = { bg = "#989898", fg = common_fg, gui = "bold" }, + b = { bg = "#ABABAB", fg = common_fg }, + c = { bg = "#B9B9B9", fg = "#555555" }, + }, + + insert = { + a = { bg = "#91ADBA", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#C5A7C4", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#C4C4C4", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#E1C1C9", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/tokyobones.lua b/lua/lualine/themes/tokyobones.lua index 5e99e04..100f0e9 100644 --- a/lua/lualine/themes/tokyobones.lua +++ b/lua/lualine/themes/tokyobones.lua @@ -1 +1 @@ -return require("lualine.themes.tokyobones_" .. vim.opt.background:get()) +return require("zenbones.util").get_lualine_theme("tokyobones") diff --git a/lua/lualine/themes/tokyobones_dark_default.lua b/lua/lualine/themes/tokyobones_dark_default.lua new file mode 100644 index 0000000..67160d8 --- /dev/null +++ b/lua/lualine/themes/tokyobones_dark_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A3A5B7" +local inactive_bg = "#242532" +local inactive_fg = "#D2D9F8" + +return { + normal = { + a = { bg = "#646683", fg = common_fg, gui = "bold" }, + b = { bg = "#43455B", fg = common_fg }, + c = { bg = "#303142", fg = "#C0CAF5" }, + }, + + insert = { + a = { bg = "#36466A", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#6E20BD", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#2C4075", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#412428", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/tokyobones_dark_stark.lua b/lua/lualine/themes/tokyobones_dark_stark.lua new file mode 100644 index 0000000..f553334 --- /dev/null +++ b/lua/lualine/themes/tokyobones_dark_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#9FA1BB" +local inactive_bg = "#1F2031" +local inactive_fg = "#D2D9F8" + +return { + normal = { + a = { bg = "#5D6088", fg = common_fg, gui = "bold" }, + b = { bg = "#3B3E5A", fg = common_fg }, + c = { bg = "#292B3F", fg = "#C0CAF5" }, + }, + + insert = { + a = { bg = "#313F61", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#641DAE", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#27396A", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#381E22", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/tokyobones_dark_warm.lua b/lua/lualine/themes/tokyobones_dark_warm.lua new file mode 100644 index 0000000..0ad5b63 --- /dev/null +++ b/lua/lualine/themes/tokyobones_dark_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A5AAC5" +local inactive_bg = "#2F334B" +local inactive_fg = "#D2D9F8" + +return { + normal = { + a = { bg = "#6A729E", fg = common_fg, gui = "bold" }, + b = { bg = "#4A5172", fg = common_fg }, + c = { bg = "#393E5A", fg = "#C0CAF5" }, + }, + + insert = { + a = { bg = "#445682", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#8429E1", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#375090", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#553137", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/tokyobones_light_bright.lua b/lua/lualine/themes/tokyobones_light_bright.lua new file mode 100644 index 0000000..7e67c56 --- /dev/null +++ b/lua/lualine/themes/tokyobones_light_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#474B5A" +local inactive_bg = "#C4C6D0" +local inactive_fg = "#5F6B9B" + +return { + normal = { + a = { bg = "#979BAC", fg = common_fg, gui = "bold" }, + b = { bg = "#AAADBC", fg = common_fg }, + c = { bg = "#BBBEC9", fg = "#333A57" }, + }, + + insert = { + a = { bg = "#A4AEC7", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#BAB2CE", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#C4C8DD", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#E4C8CC", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/tokyobones_light_default.lua b/lua/lualine/themes/tokyobones_light_default.lua new file mode 100644 index 0000000..2a9529d --- /dev/null +++ b/lua/lualine/themes/tokyobones_light_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#464953" +local inactive_bg = "#BCBEC6" +local inactive_fg = "#5F6B9B" + +return { + normal = { + a = { bg = "#9395A2", fg = common_fg, gui = "bold" }, + b = { bg = "#A6A8B3", fg = common_fg }, + c = { bg = "#B4B6BE", fg = "#333A57" }, + }, + + insert = { + a = { bg = "#9BA6C2", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#B3A9C9", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#BBC0D8", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#DFBEC3", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/tokyobones_light_dim.lua b/lua/lualine/themes/tokyobones_light_dim.lua new file mode 100644 index 0000000..cb92e81 --- /dev/null +++ b/lua/lualine/themes/tokyobones_light_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#44464F" +local inactive_bg = "#B7B8C0" +local inactive_fg = "#5F6B9B" + +return { + normal = { + a = { bg = "#8E909C", fg = common_fg, gui = "bold" }, + b = { bg = "#9EA0AB", fg = common_fg }, + c = { bg = "#ACADB6", fg = "#333A57" }, + }, + + insert = { + a = { bg = "#929EBC", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#ABA0C3", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#B2B8D3", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#DBB5BA", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/vimbones.lua b/lua/lualine/themes/vimbones.lua index b2fc558..630df66 100644 --- a/lua/lualine/themes/vimbones.lua +++ b/lua/lualine/themes/vimbones.lua @@ -1,34 +1 @@ --- This file is auto-generated by shipwright.nvim -local common_fg = "#515143" -local inactive_bg = "#D6D6B5" -local inactive_fg = "#686868" - -return { - normal = { - a = { bg = "#A7A78D", fg = common_fg, gui = "bold" }, - b = { bg = "#BABB9D", fg = common_fg }, - c = { bg = "#CBCBAB", fg = "#353535" }, - }, - - insert = { - a = { bg = "#A9BED1", fg = common_fg, gui = "bold" }, - }, - - command = { - a = { bg = "#DEB9D6", fg = common_fg, gui = "bold" }, - }, - - visual = { - a = { bg = "#D7D7D7", fg = common_fg, gui = "bold" }, - }, - - replace = { - a = { bg = "#EBD8DA", fg = common_fg, gui = "bold" }, - }, - - inactive = { - a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, - b = { bg = inactive_bg, fg = inactive_fg }, - c = { bg = inactive_bg, fg = inactive_fg }, - }, -} +return require("zenbones.util").get_lualine_theme("vimbones") diff --git a/lua/lualine/themes/vimbones_bright.lua b/lua/lualine/themes/vimbones_bright.lua new file mode 100644 index 0000000..d4f901f --- /dev/null +++ b/lua/lualine/themes/vimbones_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#535343" +local inactive_bg = "#DCDCB4" +local inactive_fg = "#686868" + +return { + normal = { + a = { bg = "#ADAD8D", fg = common_fg, gui = "bold" }, + b = { bg = "#C3C39F", fg = common_fg }, + c = { bg = "#D1D1AB", fg = "#353535" }, + }, + + insert = { + a = { bg = "#B4C6D6", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#E2C3DB", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#DFDFDF", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#F0E2E4", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/vimbones_default.lua b/lua/lualine/themes/vimbones_default.lua new file mode 100644 index 0000000..b2fc558 --- /dev/null +++ b/lua/lualine/themes/vimbones_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#515143" +local inactive_bg = "#D6D6B5" +local inactive_fg = "#686868" + +return { + normal = { + a = { bg = "#A7A78D", fg = common_fg, gui = "bold" }, + b = { bg = "#BABB9D", fg = common_fg }, + c = { bg = "#CBCBAB", fg = "#353535" }, + }, + + insert = { + a = { bg = "#A9BED1", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#DEB9D6", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#D7D7D7", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EBD8DA", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/vimbones_dim.lua b/lua/lualine/themes/vimbones_dim.lua new file mode 100644 index 0000000..bbb8c40 --- /dev/null +++ b/lua/lualine/themes/vimbones_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#4E4E42" +local inactive_bg = "#CECEB1" +local inactive_fg = "#686868" + +return { + normal = { + a = { bg = "#A2A28B", fg = common_fg, gui = "bold" }, + b = { bg = "#B5B59B", fg = common_fg }, + c = { bg = "#C3C3A7", fg = "#353535" }, + }, + + insert = { + a = { bg = "#9EB6CB", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#D9AFD0", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#CFCFCF", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#E7CFD1", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenbones.lua b/lua/lualine/themes/zenbones.lua index 7f82ebe..05bf822 100644 --- a/lua/lualine/themes/zenbones.lua +++ b/lua/lualine/themes/zenbones.lua @@ -1 +1 @@ -return require("lualine.themes.zenbones_" .. vim.opt.background:get()) +return require("zenbones.util").get_lualine_theme("zenbones") diff --git a/lua/lualine/themes/zenflesh.lua b/lua/lualine/themes/zenbones_dark_default.lua similarity index 69% rename from lua/lualine/themes/zenflesh.lua rename to lua/lualine/themes/zenbones_dark_default.lua index 7ee10cd..aec2b8d 100644 --- a/lua/lualine/themes/zenflesh.lua +++ b/lua/lualine/themes/zenbones_dark_default.lua @@ -1,13 +1,13 @@ --- This file is auto-generated from lua/zenbones/template/lualine.lua +-- This file is auto-generated by shipwright.nvim local common_fg = "#AFA099" -local inactive_bg = "#322D2B" +local inactive_bg = "#272321" local inactive_fg = "#CAD0D4" return { normal = { - a = { bg = "#736863", fg = common_fg, gui = "bold" }, - b = { bg = "#4F4844", fg = common_fg }, - c = { bg = "#3E3835", fg = "#B4BDC3" }, + a = { bg = "#706661", fg = common_fg, gui = "bold" }, + b = { bg = "#4A433F", fg = common_fg }, + c = { bg = "#352F2D", fg = "#B4BDC3" }, }, insert = { diff --git a/lua/lualine/themes/zenbones_dark_stark.lua b/lua/lualine/themes/zenbones_dark_stark.lua new file mode 100644 index 0000000..ee5b466 --- /dev/null +++ b/lua/lualine/themes/zenbones_dark_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#B39C90" +local inactive_bg = "#241E1B" +local inactive_fg = "#CAD0D4" + +return { + normal = { + a = { bg = "#6F6058", fg = common_fg, gui = "bold" }, + b = { bg = "#483E38", fg = common_fg }, + c = { bg = "#302825", fg = "#B4BDC3" }, + }, + + insert = { + a = { bg = "#2D404E", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#5C3D56", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#37393B", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#361C1F", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenbones_dark_warm.lua b/lua/lualine/themes/zenbones_dark_warm.lua new file mode 100644 index 0000000..dfc6666 --- /dev/null +++ b/lua/lualine/themes/zenbones_dark_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#B1A39C" +local inactive_bg = "#2D2927" +local inactive_fg = "#CAD0D4" + +return { + normal = { + a = { bg = "#726964", fg = common_fg, gui = "bold" }, + b = { bg = "#4F4844", fg = common_fg }, + c = { bg = "#3B3633", fg = "#B4BDC3" }, + }, + + insert = { + a = { bg = "#374E5F", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#6E4966", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#444749", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#47272B", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenbones_light_bright.lua b/lua/lualine/themes/zenbones_light_bright.lua new file mode 100644 index 0000000..7ab0c9f --- /dev/null +++ b/lua/lualine/themes/zenbones_light_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#5C504A" +local inactive_bg = "#E1D8D4" +local inactive_fg = "#596A76" + +return { + normal = { + a = { bg = "#BDA79B", fg = common_fg, gui = "bold" }, + b = { bg = "#CEBEB6", fg = common_fg }, + c = { bg = "#D8CCC7", fg = "#2C363C" }, + }, + + insert = { + a = { bg = "#B4C6D6", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#E2C3DB", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#D6E1E9", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#F0E2E4", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenbones_light_default.lua b/lua/lualine/themes/zenbones_light_default.lua new file mode 100644 index 0000000..2d89cbd --- /dev/null +++ b/lua/lualine/themes/zenbones_light_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#564E4A" +local inactive_bg = "#DAD3CF" +local inactive_fg = "#596A76" + +return { + normal = { + a = { bg = "#B2A39B", fg = common_fg, gui = "bold" }, + b = { bg = "#C4B6AF", fg = common_fg }, + c = { bg = "#D1C7C3", fg = "#2C363C" }, + }, + + insert = { + a = { bg = "#A9BED1", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#DEB9D6", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#CBD9E3", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EBD8DA", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenbones_light_dim.lua b/lua/lualine/themes/zenbones_light_dim.lua new file mode 100644 index 0000000..0d2c466 --- /dev/null +++ b/lua/lualine/themes/zenbones_light_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#534C49" +local inactive_bg = "#D3CAC6" +local inactive_fg = "#596A76" + +return { + normal = { + a = { bg = "#AC9E97", fg = common_fg, gui = "bold" }, + b = { bg = "#BFB0A9", fg = common_fg }, + c = { bg = "#CABFBA", fg = "#2C363C" }, + }, + + insert = { + a = { bg = "#9EB6CB", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#D9AFD0", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#C0D1DE", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#E7CFD1", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenburned.lua b/lua/lualine/themes/zenburned.lua index a758de6..226c58d 100644 --- a/lua/lualine/themes/zenburned.lua +++ b/lua/lualine/themes/zenburned.lua @@ -1,34 +1 @@ --- This file is auto-generated by shipwright.nvim -local common_fg = "#B6B6B6" -local inactive_bg = "#525252" -local inactive_fg = "#F5EDE0" - -return { - normal = { - a = { bg = "#868686", fg = common_fg, gui = "bold" }, - b = { bg = "#6A6A6A", fg = common_fg }, - c = { bg = "#5C5C5C", fg = "#F0E4CF" }, - }, - - insert = { - a = { bg = "#53738B", fg = common_fg, gui = "bold" }, - }, - - command = { - a = { bg = "#9C6992", fg = common_fg, gui = "bold" }, - }, - - visual = { - a = { bg = "#746956", fg = common_fg, gui = "bold" }, - }, - - replace = { - a = { bg = "#764544", fg = common_fg, gui = "bold" }, - }, - - inactive = { - a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, - b = { bg = inactive_bg, fg = inactive_fg }, - c = { bg = inactive_bg, fg = inactive_fg }, - }, -} +return require("zenbones.util").get_lualine_theme("zenburned") diff --git a/lua/lualine/themes/zenburned_default.lua b/lua/lualine/themes/zenburned_default.lua new file mode 100644 index 0000000..2ab0559 --- /dev/null +++ b/lua/lualine/themes/zenburned_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#B6B6B6" +local inactive_bg = "#494949" +local inactive_fg = "#F5EDE0" + +return { + normal = { + a = { bg = "#848484", fg = common_fg, gui = "bold" }, + b = { bg = "#666666", fg = common_fg }, + c = { bg = "#555555", fg = "#F0E4CF" }, + }, + + insert = { + a = { bg = "#53738B", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#9C6992", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#746956", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#764544", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenburned_stark.lua b/lua/lualine/themes/zenburned_stark.lua new file mode 100644 index 0000000..ea3d545 --- /dev/null +++ b/lua/lualine/themes/zenburned_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#BBB1B2" +local inactive_bg = "#4D4244" +local inactive_fg = "#F5EDE0" + +return { + normal = { + a = { bg = "#8E7A7D", fg = common_fg, gui = "bold" }, + b = { bg = "#6D5D60", fg = common_fg }, + c = { bg = "#574A4D", fg = "#F0E4CF" }, + }, + + insert = { + a = { bg = "#4E6C82", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#926389", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#6C6250", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#6D3F3E", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenburned_warm.lua b/lua/lualine/themes/zenburned_warm.lua new file mode 100644 index 0000000..de755b2 --- /dev/null +++ b/lua/lualine/themes/zenburned_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#B9B9B9" +local inactive_bg = "#505050" +local inactive_fg = "#F5EDE0" + +return { + normal = { + a = { bg = "#898989", fg = common_fg, gui = "bold" }, + b = { bg = "#6A6A6A", fg = common_fg }, + c = { bg = "#595959", fg = "#F0E4CF" }, + }, + + insert = { + a = { bg = "#597B94", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#A5709B", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#7C715C", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#804B4A", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenwritten.lua b/lua/lualine/themes/zenwritten.lua index 132c2af..c46a938 100644 --- a/lua/lualine/themes/zenwritten.lua +++ b/lua/lualine/themes/zenwritten.lua @@ -1 +1 @@ -return require("lualine.themes.zenwritten_" .. vim.opt.background:get()) +return require("zenbones.util").get_lualine_theme("zenwritten") diff --git a/lua/lualine/themes/zenwritten_dark_default.lua b/lua/lualine/themes/zenwritten_dark_default.lua new file mode 100644 index 0000000..89121f5 --- /dev/null +++ b/lua/lualine/themes/zenwritten_dark_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A3A3A3" +local inactive_bg = "#242424" +local inactive_fg = "#CFCFCF" + +return { + normal = { + a = { bg = "#686868", fg = common_fg, gui = "bold" }, + b = { bg = "#444444", fg = common_fg }, + c = { bg = "#303030", fg = "#BBBBBB" }, + }, + + insert = { + a = { bg = "#324757", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#65435E", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#404040", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#3E2225", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenwritten_dark_stark.lua b/lua/lualine/themes/zenwritten_dark_stark.lua new file mode 100644 index 0000000..ca8197b --- /dev/null +++ b/lua/lualine/themes/zenwritten_dark_stark.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#AB9D9F" +local inactive_bg = "#241E1F" +local inactive_fg = "#CFCFCF" + +return { + normal = { + a = { bg = "#6F5F62", fg = common_fg, gui = "bold" }, + b = { bg = "#483D3F", fg = common_fg }, + c = { bg = "#302829", fg = "#BBBBBB" }, + }, + + insert = { + a = { bg = "#2D404E", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#5C3D56", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#393939", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#361C1F", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenwritten_dark_warm.lua b/lua/lualine/themes/zenwritten_dark_warm.lua new file mode 100644 index 0000000..33a7e27 --- /dev/null +++ b/lua/lualine/themes/zenwritten_dark_warm.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#A6A6A6" +local inactive_bg = "#2A2A2A" +local inactive_fg = "#CFCFCF" + +return { + normal = { + a = { bg = "#6A6A6A", fg = common_fg, gui = "bold" }, + b = { bg = "#494949", fg = common_fg }, + c = { bg = "#373737", fg = "#BBBBBB" }, + }, + + insert = { + a = { bg = "#374E5F", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#6E4966", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#474747", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#47272B", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenwritten_light_bright.lua b/lua/lualine/themes/zenwritten_light_bright.lua new file mode 100644 index 0000000..fe59380 --- /dev/null +++ b/lua/lualine/themes/zenwritten_light_bright.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#5A5052" +local inactive_bg = "#DCD9DA" +local inactive_fg = "#686868" + +return { + normal = { + a = { bg = "#B2A9AA", fg = common_fg, gui = "bold" }, + b = { bg = "#C5BFC0", fg = common_fg }, + c = { bg = "#D2CECE", fg = "#353535" }, + }, + + insert = { + a = { bg = "#B4C6D6", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#E2C3DB", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#DFDFDF", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#F0E2E4", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenwritten_light_default.lua b/lua/lualine/themes/zenwritten_light_default.lua new file mode 100644 index 0000000..2f4d595 --- /dev/null +++ b/lua/lualine/themes/zenwritten_light_default.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#505050" +local inactive_bg = "#D4D4D4" +local inactive_fg = "#686868" + +return { + normal = { + a = { bg = "#A6A6A6", fg = common_fg, gui = "bold" }, + b = { bg = "#B9B9B9", fg = common_fg }, + c = { bg = "#C9C9C9", fg = "#353535" }, + }, + + insert = { + a = { bg = "#A9BED1", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#DEB9D6", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#D7D7D7", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#EBD8DA", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/lualine/themes/zenwritten_light_dim.lua b/lua/lualine/themes/zenwritten_light_dim.lua new file mode 100644 index 0000000..c6a133b --- /dev/null +++ b/lua/lualine/themes/zenwritten_light_dim.lua @@ -0,0 +1,34 @@ +-- This file is auto-generated by shipwright.nvim +local common_fg = "#4E4E4E" +local inactive_bg = "#CCCCCC" +local inactive_fg = "#686868" + +return { + normal = { + a = { bg = "#A0A0A0", fg = common_fg, gui = "bold" }, + b = { bg = "#B3B3B3", fg = common_fg }, + c = { bg = "#C1C1C1", fg = "#353535" }, + }, + + insert = { + a = { bg = "#9EB6CB", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#D9AFD0", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#CFCFCF", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#E7CFD1", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index 20ac7eb..e3c8abd 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -1,22 +1,38 @@ local M = {} -local function make_env(colorscheme) - local specs = colorscheme.specs - vim.opt.background = colorscheme.background - package.loaded[specs] = nil +local function make_specs(specs_name, ness) + local background = vim.opt.background:get() + package.loaded[specs_name] = nil + if ness == nil then + return require(specs_name) + end + vim.g[specs_name .. "_" .. background .. "ness"] = ness + local specs = require(specs_name) + vim.g[specs_name .. "_" .. background .. "ness"] = nil + return specs +end +local function make_env(colorscheme) + local specs_name = colorscheme.specs local builder = require "shipwright.builder" - local p = require(specs .. ".palette")[colorscheme.background] - local env = builder.make_env { + local p = require(specs_name .. ".palette")[colorscheme.background] + local env = { name = colorscheme.name, - specs_name = specs, - specs = require(specs), + specs_name = specs_name, p = p, background = colorscheme.background, + description = colorscheme.description, term = require("zenbones.term").colors_map(p), transform = require "zenbones.shipwright.transform", } - return env + + vim.opt.background = colorscheme.background + env.specs = make_specs(specs_name) + local ness = colorscheme.background == "light" and { "dim", "bright" } or { "stark", "warm" } + env["specs_" .. ness[1]] = make_specs(specs_name, ness[1]) + env["specs_" .. ness[2]] = make_specs(specs_name, ness[2]) + + return builder.make_env(env) end local function make_build_fn(file) @@ -32,6 +48,7 @@ local function make_runners(config) name = config.name .. "_light", specs = config.name, background = "light", + description = config.description, } ), setfenv( @@ -40,6 +57,7 @@ local function make_runners(config) name = config.name .. "_dark", specs = config.name, background = "dark", + description = config.description, } ), } @@ -52,6 +70,7 @@ local function make_runners(config) name = config.name, specs = config.name, background = config.background, + description = config.description, } ), } diff --git a/lua/zenbones/shipwright/runners/kitty.lua b/lua/zenbones/shipwright/runners/kitty.lua index 5ac0eec..08d585c 100644 --- a/lua/zenbones/shipwright/runners/kitty.lua +++ b/lua/zenbones/shipwright/runners/kitty.lua @@ -9,6 +9,7 @@ run( author = "Michael Chris Lopez", license = "MIT", upstream = string.format("https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/%s.conf", name), + blurb = description, url_color = term.bright_magenta, tab_active_bg = specs.Search.bg, tab_active_fg = colors.fg, diff --git a/lua/zenbones/shipwright/runners/lightline.lua b/lua/zenbones/shipwright/runners/lightline.lua index 4b0a36b..dd50c2f 100644 --- a/lua/zenbones/shipwright/runners/lightline.lua +++ b/lua/zenbones/shipwright/runners/lightline.lua @@ -57,22 +57,23 @@ local function transform(colors) end local function specs_to_colors(colorscheme) - local specs, name = unpack(colorscheme) + local specs, name, background = unpack(colorscheme) + local da = background == "light" and -3 or 3 return { name = name, common_fg = specs.Folded.fg, inactive_bg = specs.StatusLineNC.bg, inactive_fg = specs.StatusLineNC.fg, - normal_a_bg = specs.PmenuSbar.bg, - normal_b_bg = specs.PmenuSel.bg, - normal_c_bg = specs.StatusLine.bg, + normal_a_bg = specs.PmenuSbar.bg.abs_da(da), + normal_b_bg = specs.PmenuSel.bg.abs_da(da), + normal_c_bg = specs.StatusLine.bg.abs_da(da), normal_c_fg = specs.StatusLine.fg, insert_a_bg = specs.DiffText.bg, visual_a_bg = specs.Visual.bg, replace_a_bg = specs.DiffDelete.bg, - tabline_left_bg = specs.PmenuSel.bg, + tabline_left_bg = specs.PmenuSel.bg.abs_da(da), tabline_left_fg = specs.Normal.fg, - tabline_right_bg = specs.PmenuSel.bg, + tabline_right_bg = specs.PmenuSel.bg.abs_da(da), tabline_right_fg = specs.Normal.fg, tabsel_bg = specs.Normal.bg, tabsel_fg = specs.Normal.fg, @@ -86,7 +87,7 @@ end ---@diagnostic disable: undefined-global -- selene: allow(undefined_variable) run( - { specs, name }, + { specs, name, background }, specs_to_colors, transform, { prepend, [[" This file is auto-generated by shipwright.nvim]] }, diff --git a/lua/zenbones/shipwright/runners/lualine.lua b/lua/zenbones/shipwright/runners/lualine.lua index 79c7a60..bbe66d0 100644 --- a/lua/zenbones/shipwright/runners/lualine.lua +++ b/lua/zenbones/shipwright/runners/lualine.lua @@ -57,14 +57,16 @@ local function to_lualine(colors) return { text } end -local function specs_to_colors(specs) +local function specs_to_colors(colorscheme) + local specs, background = unpack(colorscheme) + local da = background == "light" and -3 or 3 return { common_fg = specs.Folded.fg, inactive_bg = specs.StatusLineNC.bg, inactive_fg = specs.StatusLineNC.fg, - normal_a_bg = specs.PmenuSbar.bg, - normal_b_bg = specs.PmenuSel.bg, - normal_c_bg = specs.StatusLine.bg, + normal_a_bg = specs.PmenuSbar.bg.abs_da(da), + normal_b_bg = specs.PmenuSel.bg.abs_da(da), + normal_c_bg = specs.StatusLine.bg.abs_da(da), normal_c_fg = specs.StatusLine.fg, insert_a_bg = specs.DiffText.bg, command_a_bg = specs.Search.bg, @@ -73,14 +75,22 @@ local function specs_to_colors(specs) } end ----@diagnostic disable: undefined-global --- selene: allow(undefined_variable) -run( - specs, - specs_to_colors, - to_lualine, - { prepend, "-- This file is auto-generated by shipwright.nvim" }, - { overwrite, string.format("lua/lualine/themes/%s.lua", name) } -) --- selene: deny(undefined_variable) ----@diagnostic enable: undefined-global +local ness_list = { "dim", "bright", "stark", "warm", "default" } + +for _, ness in ipairs(ness_list) do + local specs_name = ness ~= "default" and "specs_" .. ness or "specs" + local specs = getfenv()[specs_name] + if specs then + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) + run( + { specs, background }, + specs_to_colors, + to_lualine, + { prepend, "-- This file is auto-generated by shipwright.nvim" }, + { overwrite, string.format("lua/lualine/themes/%s_%s.lua", name, ness) } + ) + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global + end +end diff --git a/lua/zenbones/specs/dark.lua b/lua/zenbones/specs/dark.lua index ccf6d89..3b51149 100644 --- a/lua/zenbones/specs/dark.lua +++ b/lua/zenbones/specs/dark.lua @@ -65,22 +65,22 @@ local function generate(p, opt) DiffDelete { bg = p.rose.saturation(30).lightness(p1.bg.l + 8) }, -- diff mode: Deleted line |diff.txt| DiffText { bg = p.water.saturation(50).lightness(p1.bg.l + 20), fg = p.fg }, -- diff mode: Changed text within a changed line |diff.txt| - LineNr { fg = p1.bg.li(opt.lighten_line_nr or 35), bg = opt.solid_line_nr and p1.bg.li(6) or "NONE" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + LineNr { fg = p1.bg.li(opt.lighten_line_nr or 35), bg = opt.solid_line_nr and p1.bg.li(4) or "NONE" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' - Folded { bg = p1.bg.li(16), fg = p1.bg.li(64) }, -- line used for closed folds + Folded { bg = p1.bg.li(14), fg = p1.bg.li(64) }, -- line used for closed folds CursorLineNr { LineNr, fg = p.fg, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") -- MsgArea { }, -- Area for messages and cmdline -- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display' MoreMsg { fg = p.leaf, gui = "bold" }, -- |more-prompt| - NormalFloat { bg = p1.bg.li(8) }, -- Normal text in floating windows. + NormalFloat { bg = p1.bg.li(10) }, -- Normal text in floating windows. FloatBorder { fg = p1.bg.li(46), bg = opt.solid_float_border and NormalFloat.bg or "NONE" }, -- Normal text in floating windows. - Pmenu { bg = p1.bg.li(12) }, -- Popup menu: normal item. - PmenuSel { bg = p1.bg.li(24) }, -- Popup menu: selected item. - PmenuSbar { bg = p1.bg.li(40) }, -- Popup menu: scrollbar. + Pmenu { bg = p1.bg.li(10) }, -- Popup menu: normal item. + PmenuSel { bg = p1.bg.li(22) }, -- Popup menu: selected item. + PmenuSbar { bg = p1.bg.li(32) }, -- Popup menu: scrollbar. PmenuThumb { bg = p1.bg.li(50) }, -- Popup menu: Thumb of the scrollbar. Search { bg = p.blossom.lightness(p1.bg.l + 24), fg = p.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. @@ -94,8 +94,8 @@ local function generate(p, opt) SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare { SpellBad, guisp = p.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine { bg = p1.bg.li(16), fg = p.fg }, -- status line of current window - StatusLineNC { bg = p1.bg.li(11), fg = p.fg.li(28) }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + StatusLine { bg = p1.bg.li(12), fg = p.fg }, -- status line of current window + StatusLineNC { bg = p1.bg.li(6), fg = p.fg.li(28) }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. TabLine { StatusLine }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label diff --git a/lua/zenbones/specs/light.lua b/lua/zenbones/specs/light.lua index 76e3ea5..ae465e7 100644 --- a/lua/zenbones/specs/light.lua +++ b/lua/zenbones/specs/light.lua @@ -75,7 +75,7 @@ local function generate(p, opt) -- MsgArea { }, -- Area for messages and cmdline -- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display' MoreMsg { fg = p.leaf, gui = "bold" }, -- |more-prompt| - NormalFloat { bg = p1.bg.da(6) }, -- Normal text in floating windows. + NormalFloat { bg = p1.bg.da(8) }, -- Normal text in floating windows. FloatBorder { fg = p1.bg.da(50), bg = opt.solid_float_border and NormalFloat.bg or "NONE" }, -- Normal text in floating windows. Pmenu { bg = p1.bg.da(10) }, -- Popup menu: normal item. @@ -94,8 +94,8 @@ local function generate(p, opt) SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare { SpellBad, sp = p.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine { bg = p1.bg.da(14), fg = p.fg }, -- status line of current window - StatusLineNC { bg = p1.bg.da(10), fg = p.fg.li(28) }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + StatusLine { bg = p1.bg.da(12), fg = p.fg }, -- status line of current window + StatusLineNC { bg = p1.bg.da(6), fg = p.fg.li(28) }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. TabLine { StatusLine }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label diff --git a/lua/zenbones/util.lua b/lua/zenbones/util.lua index a900695..0563628 100644 --- a/lua/zenbones/util.lua +++ b/lua/zenbones/util.lua @@ -3,13 +3,48 @@ local M = {} --- Apply a zenbones colorscheme based on g:colors_name and &background. ---@return nil function M.apply_colorscheme() - local colors_name = vim.api.nvim_get_var "colors_name" + local colors_name = vim.g.colors_name package.loaded[colors_name] = nil require "lush"(require(colors_name), { force_clean = false }) local p = require(colors_name .. ".palette")[vim.opt.background:get()] require("zenbones.term").apply_colors(p) end +function M.get_colorscheme_list() + local json_decode = vim.fn.has "nvim-0.6.0" == 1 and vim.json.decode or vim.fn.json_decode + local file = io.open(vim.api.nvim_get_runtime_file("colorschemes.json", false)[1], "r") + local content = file:read "*a" + file:close() + return json_decode(content) +end + +function M.get_colorscheme(name) + local colorschemes = M.get_colorscheme_list() + local colorscheme = nil + for _, c in ipairs(colorschemes) do + if c.name == name then + colorscheme = c + end + end + if colorscheme == nil then + error(string.format("Invalid name %s", name)) + end + return colorscheme +end + +function M.get_lualine_theme(name) + local colorscheme = M.get_colorscheme(name) + local ness_config = vim.g[name] and vim.g[name][string.format("%sness", colorscheme.background)] + or vim.g[string.format("%s_%sness", name, colorscheme.background)] + local ness = ness_config or "default" + + if colorscheme.background then + return require(string.format("lualine.themes.%s_%s", name, ness)) + else + return require(string.format("lualine.themes.%s_%s_%s", name, vim.opt.background:get(), ness)) + end +end + --- Auto-fill a palette with the default palette. ---@param p table palette ---@param base_bg string light or dark