Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tinted-theming/base16-vim support due to rename #1346

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion THEMES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<p>
Expand Down
26 changes: 13 additions & 13 deletions lua/lualine/themes/base16.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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()