mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-25 10:18:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins/base16: minor improvements (#983)

Browse source
This commit is contained in:
player131007 2024-02-08 05:28:06 +07:00 • committed by GitHub
parent 2e18333dd2
commit ec07263b16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/colorschemes/base16.nix
View file

@ -22,9 +22,9 @@ in {
}; };
colorscheme = mkOption { colorscheme = mkOption {
type = types.enum themes; type = types.nullOr (types.enum themes);
description = "The base16 colorscheme to use"; description = "The base16 colorscheme to use";
default = head themes; default = null;
}; };
setUpBar = mkOption { setUpBar = mkOption {
@ -83,15 +83,29 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
colorscheme = "base16-${cfg.colorscheme}"; warnings = optional (cfg.colorscheme != null && cfg.customColorScheme != null) "
You have set both `colorschemes.base16.colorscheme` and `colorschemes.base16.customColorScheme`, `colorscheme` will be preferred.
";
assertions = [
{
assertion = cfg.colorscheme != null || cfg.customColorScheme != null;
message = ''
You have enabled `colorschemes.base16` but haven't set a specific color scheme.
Please set a color scheme using `colorschemes.base16.colorscheme` or `colorschemes.base16.customColorScheme`.
'';
}
];
colorscheme = mkIf (cfg.colorscheme != null) "base16-${cfg.colorscheme}";
extraPlugins = [cfg.package]; extraPlugins = [cfg.package];
plugins.airline.theme = mkIf cfg.setUpBar "base16"; plugins.airline.theme = mkIf cfg.setUpBar "base16";
plugins.lualine.theme = mkIf cfg.setUpBar "base16";
plugins.lightline.colorscheme = null; plugins.lightline.colorscheme = null;
options.termguicolors = mkIf cfg.useTruecolor true; options.termguicolors = mkIf cfg.useTruecolor true;
extraConfigLua = mkIf (cfg.customColorScheme != null) '' extraConfigLuaPre = mkIf (cfg.customColorScheme != null) ''
require('base16-colorscheme').setup(${helpers.toLuaObject cfg.customColorScheme}) require('base16-colorscheme').setup(${helpers.toLuaObject cfg.customColorScheme})
''; '';
}; };

5
tests/test-sources/plugins/colorschemes/base16.nix
View file

@ -1,8 +1,5 @@
{ {
# Empty configuration # No empty test because not setting `colorscheme` and `customColorScheme` would error
empty = {
colorschemes.base16.enable = true;
};
# All the upstream default options of poimandres # All the upstream default options of poimandres
defaults = { defaults = {