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

helpers: highlightType -> nixvimTypes.highlight

Browse source
This commit is contained in:
Gaetan Lepage 2024-01-01 23:47:06 +01:00 • committed by Gaétan Lepage
parent af41ea2d80
commit d88a30fba6
3 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

67
lib/helpers.nix
View file

@ -59,39 +59,6 @@ with lib; rec {
emptyTable = {"__empty" = null;};
highlightType = with lib.types;
submodule {
# Adds flexibility for other keys
freeformType = types.attrs;
# :help nvim_set_hl()
options = {
fg = mkNullOrOption str "Color for the foreground (color name or '#RRGGBB').";
bg = mkNullOrOption str "Color for the background (color name or '#RRGGBB').";
sp = mkNullOrOption str "Special color (color name or '#RRGGBB').";
blend = mkNullOrOption (numbers.between 0 100) "Integer between 0 and 100.";
bold = mkNullOrOption bool "";
standout = mkNullOrOption bool "";
underline = mkNullOrOption bool "";
undercurl = mkNullOrOption bool "";
underdouble = mkNullOrOption bool "";
underdotted = mkNullOrOption bool "";
underdashed = mkNullOrOption bool "";
strikethrough = mkNullOrOption bool "";
italic = mkNullOrOption bool "";
reverse = mkNullOrOption bool "";
nocombine = mkNullOrOption bool "";
link = mkNullOrOption str "Name of another highlight group to link to.";
default = mkNullOrOption bool "Don't override existing definition.";
ctermfg = mkNullOrOption str "Sets foreground of cterm color.";
ctermbg = mkNullOrOption str "Sets background of cterm color.";
cterm = mkNullOrOption attrs ''
cterm attribute map, like |highlight-args|.
If not set, cterm attributes will match those from the attribute map documented above.
'';
};
};
borderType = with lib.types;
oneOf [
str
@ -290,7 +257,7 @@ with lib; rec {
mkHighlight = default: name: desc:
mkNullable
highlightType
nixvimTypes.highlight
default
(
if desc == ""
@ -413,6 +380,38 @@ with lib; rec {
merge = mergeEqualOption;
check = isRawType;
};
highlight = types.submodule {
# Adds flexibility for other keys
freeformType = types.attrs;
# :help nvim_set_hl()
options = with types; {
fg = mkNullOrOption str "Color for the foreground (color name or '#RRGGBB').";
bg = mkNullOrOption str "Color for the background (color name or '#RRGGBB').";
sp = mkNullOrOption str "Special color (color name or '#RRGGBB').";
blend = mkNullOrOption (numbers.between 0 100) "Integer between 0 and 100.";
bold = mkNullOrOption bool "";
standout = mkNullOrOption bool "";
underline = mkNullOrOption bool "";
undercurl = mkNullOrOption bool "";
underdouble = mkNullOrOption bool "";
underdotted = mkNullOrOption bool "";
underdashed = mkNullOrOption bool "";
strikethrough = mkNullOrOption bool "";
italic = mkNullOrOption bool "";
reverse = mkNullOrOption bool "";
nocombine = mkNullOrOption bool "";
link = mkNullOrOption str "Name of another highlight group to link to.";
default = mkNullOrOption bool "Don't override existing definition.";
ctermfg = mkNullOrOption str "Sets foreground of cterm color.";
ctermbg = mkNullOrOption str "Sets background of cterm color.";
cterm = mkNullOrOption attrs ''
cterm attribute map, like |highlight-args|.
If not set, cterm attributes will match those from the attribute map documented above.
'';
};
};
}
# Allow to do `with nixvimTypes;` instead of `with types;`
// types;

2
modules/highlights.nix
View file

@ -7,7 +7,7 @@
with lib; {
options = {
highlight = mkOption {
type = types.attrsOf helpers.highlightType;
type = types.attrsOf helpers.nixvimTypes.highlight;
default = {};
description = "Define highlight groups";
example = ''

2
plugins/colorschemes/ayu.nix
View file

@ -25,7 +25,7 @@ in {
(
with types;
either
(attrsOf helpers.highlightType)
(attrsOf helpers.nixvimTypes.highlight)
str
)
"{}"