This commit is contained in:
Ching Pei Yang 2024-05-07 01:08:41 -04:00 committed by GitHub
commit 24aa928785
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 86 deletions

View file

@ -4,100 +4,51 @@
... ...
}: let }: let
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) attrsOf attrs bool enum; inherit (lib.types) attrsOf enum nullOr submodule;
inherit (lib.modules) mkRenamedOptionModule; inherit (lib.modules) mkRenamedOptionModule;
inherit (lib.nvim.types) mkPluginSetupOption; inherit (lib.nvim.config) mkBool;
settingSubmodule = submodule {
options = {
RGB = mkBool true "Colorize #RGB hex codes";
RRGGBB = mkBool true "Colorize #RRGGBB hex codes";
names = mkBool true ''Colorize "Name" codes like Blue'';
RRGGBBAA = mkBool false "Colorize #RRGGBBAA hex codes";
rgb_fn = mkBool false "Colorize CSS rgb() and rgba() functions";
hsl_fn = mkBool false "Colorize CSS hsl() and hsla() functions";
css = mkBool false "Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB";
css_fn = mkBool false "Enable all CSS *functions*: rgb_fn, hsl_fn";
mode = mkOption {
description = "Set the display mode";
type = nullOr (enum ["foreground" "background"]);
default = null;
};
};
};
in { in {
imports = [ imports = [
(mkRenamedOptionModule ["vim" "ui" "colorizer" "options"] ["vim" "ui" "colorizer" "setupOpts" "user_default_options"]) (mkRenamedOptionModule ["vim" "ui" "colorizer" "setupOpts" "defaultOptions"] ["vim" "ui" "colorizer" "options"])
(mkRenamedOptionModule ["vim" "ui" "colorizer" "filetypes"] ["vim" "ui" "colorizer" "setupOpts" "filetypes"]) (mkRenamedOptionModule ["vim" "ui" "colorizer" "setupOpts" "filetypes"] ["vim" "ui" "colorizer" "filetypes"])
]; ];
options.vim.ui.colorizer = { options.vim.ui.colorizer = {
enable = mkEnableOption "color highlighting [nvim-colorizer.lua]"; enable = mkEnableOption "color highlighting [nvim-colorizer.lua]";
setupOpts = mkPluginSetupOption "nvim-colorizer" { # colorizer has a non-standard setup function (takes two args), so we're not using setupOpts
filetypes = mkOption { options = mkOption {
type = attrsOf attrs; description = ''
default = { Default options that apply to all filetypes. Filetype specific settings from
css = {}; [filetypes](#opt-vim.ui.colorizer.filetypes) take precedence.
scss = {}; '';
}; default = {};
description = "Filetypes to highlight on"; type = settingSubmodule;
}; };
user_default_options = { filetypes = mkOption {
rgb = mkOption { description = "Filetype specific settings";
type = bool; default = {};
default = true; type = submodule {
description = "#RGB hex codes"; freeformType = attrsOf settingSubmodule;
};
rrggbb = mkOption {
type = bool;
default = true;
description = "#RRGGBB hex codes";
};
names = mkOption {
type = bool;
default = true;
description = ''"Name" codes such as "Blue"'';
};
rgb_fn = mkOption {
type = bool;
default = false;
description = "CSS rgb() and rgba() functions";
};
rrggbbaa = mkOption {
type = bool;
default = false;
description = "#RRGGBBAA hex codes";
};
hsl_fn = mkOption {
type = bool;
default = false;
description = "CSS hsl() and hsla() functions";
};
css = mkOption {
type = bool;
default = false;
description = "Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB";
};
css_fn = mkOption {
type = bool;
default = false;
description = "Enable all CSS *functions*: rgb_fn, hsl_fn";
};
mode = mkOption {
type = enum ["foreground" "background"];
default = "background";
description = "Set the display mode";
};
tailwind = mkOption {
type = bool;
default = false;
description = "Enable tailwind colors";
};
sass = mkOption {
type = bool;
default = false;
description = "Enable sass colors";
};
alwaysUpdate = mkOption {
type = bool;
default = false;
description = "Update color values even if buffer is not focused, like when using cmp_menu, cmp_docs";
};
}; };
}; };
}; };

View file

@ -15,7 +15,7 @@ in {
]; ];
vim.luaConfigRC.colorizer = entryAnywhere '' vim.luaConfigRC.colorizer = entryAnywhere ''
require('colorizer').setup(${toLuaObject cfg.setupOpts}) require('colorizer').setup(${toLuaObject cfg.filetypes}, ${toLuaObject cfg.options})
''; '';
}; };
} }