From 1ffa6f6b03f9a82fd6e6034c364c5ee4d801e3c3 Mon Sep 17 00:00:00 2001 From: Joss Wright Date: Wed, 11 Dec 2024 17:04:30 +0000 Subject: [PATCH 1/2] Fix tinted-theming base16 colour schemes The `tinted-theming/base16-vim` repository has been renamed to `tinted-theming/tinted-vim`, and the internal colour names have been renamed from `base16_gui*` to `tinted_gui*`. This caused Lualine to print a warning error when using tinted-vim. This pull updates the colour names to what `tinted-theming`now uses. I've also renamed the `setup_base16_vim()` function to `setup_tinted_vim()` for consistency. --- lua/lualine/themes/base16.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lua/lualine/themes/base16.lua b/lua/lualine/themes/base16.lua index daf6a6bff..aa3ad04d0 100644 --- a/lua/lualine/themes/base16.lua +++ b/lua/lualine/themes/base16.lua @@ -90,23 +90,23 @@ local function setup_base16_nvim() } end -local function setup_base16_vim() - -- Check if tinted-theming/base16-vim is already loaded - if vim.g.base16_gui00 and vim.g.base16_gui0F then +local function setup_tinted_vim() + -- Check if tinted-theming/tinted-vim is already loaded + if vim.g.tinted_gui00 and vim.g.tinted_gui0F then return setup { - bg = vim.g.base16_gui01, - alt_bg = vim.g.base16_gui02, - dark_fg = vim.g.base16_gui03, - fg = vim.g.base16_gui04, - light_fg = vim.g.base16_gui05, - normal = vim.g.base16_gui0D, - insert = vim.g.base16_gui0B, - visual = vim.g.base16_gui0E, - replace = vim.g.base16_gui09, + bg = vim.g.tinted_gui01, + alt_bg = vim.g.tinted_gui02, + dark_fg = vim.g.tinted_gui03, + fg = vim.g.tinted_gui04, + light_fg = vim.g.tinted_gui05, + normal = vim.g.tinted_gui0D, + insert = vim.g.tinted_gui0B, + visual = vim.g.tinted_gui0E, + replace = vim.g.tinted_gui09, } end return nil end -return setup_base16_vim() or setup_base16_nvim() or setup_default() +return setup_tinted_vim() or setup_base16_nvim() or setup_default() From a4552a99e3ab6caa1ac740e533e91cc113ba61e8 Mon Sep 17 00:00:00 2001 From: Joss Wright Date: Wed, 11 Dec 2024 17:10:54 +0000 Subject: [PATCH 2/2] Updated documentation to new tinted-theming names Updated `THEMES.md` to refer to `tinted-theming/tinted-vim` rather than the older name of `tinted-theming/base16-vim` (which now silently redirects to `tinted-theming/tinted-vim`). --- THEMES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THEMES.md b/THEMES.md index 379b62004..c82b52419 100644 --- a/THEMES.md +++ b/THEMES.md @@ -54,7 +54,7 @@ But if `g:ayuprefermirage` exists, it will load ayu_mirage instead when ### base16 -This theme will automatically use colors defined by your colorscheme using [tinted-theming/base16-vim](https://github.com/tinted-theming/base16-vim) or [RRethy/nvim-base16](https://github.com/RRethy/nvim-base16)] plugin. +This theme will automatically use colors defined by your colorscheme using [tinted-theming/tinted-vim](https://github.com/tinted-theming/tinted-vim) or [RRethy/nvim-base16](https://github.com/RRethy/nvim-base16)] plugin. The following example is using the `tomorrow-night` colorscheme: