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

Make base16_shell work for all uses of base16-vim, and rename accordingly #153

Merged
merged 2 commits into from
Sep 5, 2018

Conversation

danielwe
Copy link
Contributor

@danielwe danielwe commented Sep 5, 2018

The base16_shell theme adapts to match the selected base16-vim colorscheme, but only if base16-shell is used to configure the underlying terminal. This restriction is unnecessary: base16-vim can be used without base16-shell (either in gvim, or with termguicolors set), and the color palette is always exposed. This PR makes the theme work in all contexts, and renames it accordingly to base16_vim. Backward compatibility is retained by keeping base16_shell as an alias for base16_vim.

I also renamed the g:airline_base16_solarized option to g:airline_base16_monotone, since it has nothing to do with solarized in principle. (I actually prefer it for most, if not all, base16 themes.) Here, too, backward compatibility is retained.

The theme now dynamically loads the correct base16 palette regardless of
how base16-vim is used (using base16_shell, or setting 'termguicolors',
or using gvim). # Please enter the commit message for your changes. Lines
starting
@danielwe
Copy link
Contributor Author

danielwe commented Sep 5, 2018

On a related note, there is a long list of static base16 themes that were autogenerated at some point. It seems quite stale compared to the present state of the base16 collection; some schemes are gone and many more have been added. Would it be a good idea to remove these from the repo? It looks like they were all made from the same template for mapping palette colors to airline elements, so we could just add an option for base16_vim to use this template instead of the default one.

It may be a good idea to keep the ones that are no longer part of the official base16 collection, though, since they wouldn't be available any other way.

@chrisbra
Copy link
Member

chrisbra commented Sep 5, 2018

Thanks looks good.

It looks like they were all made from the same template for mapping palette colors to airline elements, so we could just add an option for base16_vim to use this template instead of the default one.

Yes, as far as I remember, those were some how auto generated. I fixed some wrong colors and commited them. However if they are not used, I am fine with removing at least the ones that no longer exists. If people complain, we can restore them (but I really doubt it).

@chrisbra chrisbra merged commit 725789c into vim-airline:master Sep 5, 2018
@danielwe
Copy link
Contributor Author

danielwe commented Sep 5, 2018

OK, I might take a look at it later. I think it would make things a little less confusing and overwhelming. It did take me a while to figure out how to make the themes and colorschemes work together (hence this PR). But hopefully, the rewritten docs help make things a little clearer already.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants