highlight: init #571
highlight: init #571
Conversation
modules/neovim/init/highlight.nix
Outdated
| mkOption { | ||
| type = nullOr bool; | ||
| default = null; | ||
| description = ''Whether to enable ${name}''; |
There was a problem hiding this comment.
| description = ''Whether to enable ${name}''; | |
| description = "Whether to enable ${name}"; |
Also move example between default and description please.
modules/neovim/init/highlight.nix
Outdated
| ) | ||
| cfg; | ||
| in | ||
| entryAnywhere (concatStringsSep "\n" highlights); |
There was a problem hiding this comment.
entryAnywhere should be fine, but we might benefit more from placing this before plugin setup since some of them might actually use the highlights set in this module.
| mkColorOption = target: | ||
| mkOption { | ||
| type = nullOr hexColor; | ||
| default = null; | ||
| example = "#ebdbb2"; | ||
| description = '' | ||
| The ${target} color to use. Written as color name or hex "#RRGGBB". | ||
| ''; | ||
| }; | ||
|
|
||
| mkBoolOption = name: | ||
| mkOption { | ||
| type = nullOr bool; | ||
| default = null; | ||
| example = false; | ||
| description = "Whether to enable ${name}"; | ||
| }; |
There was a problem hiding this comment.
Not a blocker, but these may be better suited for the extended lib.
| bold = mkBoolOption "bold"; | ||
| standout = mkBoolOption "standout"; | ||
| underline = mkBoolOption "underline"; | ||
| undercurl = mkBoolOption "undercurl"; | ||
| underdouble = mkBoolOption "underdouble"; | ||
| underdotted = mkBoolOption "underdotted"; | ||
| underdashed = mkBoolOption "underdashed"; | ||
| strikethrough = mkBoolOption "strikethrough"; | ||
| italic = mkBoolOption "italic"; | ||
| reverse = mkBoolOption "reverse"; | ||
| nocombine = mkBoolOption "nocombine"; |
There was a problem hiding this comment.
mapAttrs (_: mkBoolOption) can probably handle this with less repetition of code.
There was a problem hiding this comment.
// builtins.listToAttrs (map (option:
nameValuePair option (mkOption {
type = nullOr bool;
default = null;
example = false;
description = "Whether to enable ${option}";
})) [
"bold"
"standout"
"underline"
"undercurl"
"underdotted"
"underdashed"
"strikethrough"
"italic"
"reverse"
"nocombine"
"force"
]);Something like this? I don't really like that code, i think it looked better with repetition of mkBoolOption
There was a problem hiding this comment.
mapAttrs (_: mkBoolOption) {
bold = "bold";
standout = "standout";
underline = "underline";
undercurl = "undercurl";
underdouble = "underdouble";
underdotted = "underdotted";
underdashed = "underdashed";
strikethrough = "strikethrough";
italic = "italic";
reverse = "reverse";
nocombine = "nocombine";
}would do it if I'm not mistaken. But you can keep the current method.
There was a problem hiding this comment.
I feel that the code looks better with the repetition, and the two alternatives only introduce unneeded complexity and makes the code harder to read, even when there is slightly more repetition.
| ) | ||
| cfg; | ||
| in | ||
| entryBetween ["lazyConfigs" "pluginConfigs" "extraPluginConfigs"] ["theme"] (concatLines highlights); |
There was a problem hiding this comment.
CC @horriblename on this. I'm not actually sure where lazyConfigs is located in the DAG system.
There was a problem hiding this comment.
I wrote it based on the code in modules/wrapper/rc/config.nix, where those three are listed as after each other.
Creates options for configuring highlight groups, mirroring the options available in
nvim_set_hl.