-
-
Notifications
You must be signed in to change notification settings - Fork 46
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
highlight: init #571
base: main
Are you sure you want to change the base?
highlight: init #571
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
imports = [ | ||
./basic.nix | ||
./debug.nix | ||
./highlight.nix | ||
./spellcheck.nix | ||
]; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
{ | ||
config, | ||
lib, | ||
... | ||
}: let | ||
inherit (lib.options) mkOption; | ||
inherit (lib.types) nullOr attrsOf listOf submodule bool ints str enum; | ||
inherit (lib.strings) hasPrefix concatLines; | ||
inherit (lib.attrsets) mapAttrsToList; | ||
inherit (lib.nvim.dag) entryBetween; | ||
inherit (lib.nvim.lua) toLuaObject; | ||
inherit (lib.nvim.types) hexColor; | ||
|
||
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}"; | ||
}; | ||
|
||
cfg = config.vim.highlight; | ||
in { | ||
options.vim.highlight = mkOption { | ||
type = attrsOf (submodule { | ||
# See :h nvim_set_hl | ||
options = { | ||
bg = mkColorOption "background"; | ||
fg = mkColorOption "foreground"; | ||
sp = mkColorOption "special"; | ||
blend = mkOption { | ||
type = nullOr (ints.between 0 100); | ||
default = null; | ||
description = "Blend as an integer between 0 and 100"; | ||
}; | ||
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"; | ||
Comment on lines
+46
to
+56
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. // 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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. |
||
link = mkOption { | ||
type = nullOr str; | ||
default = null; | ||
description = "The name of another highlight group to link to"; | ||
}; | ||
default = mkOption { | ||
type = nullOr bool; | ||
default = null; | ||
description = "Don't override existing definition"; | ||
}; | ||
ctermfg = mkOption { | ||
type = nullOr str; | ||
default = null; | ||
description = "The cterm foreground color to use"; | ||
}; | ||
ctermbg = mkOption { | ||
type = nullOr str; | ||
default = null; | ||
description = "The cterm background color to use"; | ||
}; | ||
cterm = mkOption { | ||
type = nullOr (listOf (enum [ | ||
"bold" | ||
"underline" | ||
"undercurl" | ||
"underdouble" | ||
"underdotted" | ||
"underdashed" | ||
"strikethrough" | ||
"reverse" | ||
"inverse" | ||
"italic" | ||
"standout" | ||
"altfont" | ||
"nocombine" | ||
"NONE" | ||
])); | ||
default = null; | ||
description = "The cterm arguments to use. See :h highlight-args"; | ||
LilleAila marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
force = mkBoolOption "force update"; | ||
}; | ||
}); | ||
default = {}; | ||
example = '' | ||
{ | ||
SignColumn = { | ||
bg = "#282828"; | ||
}; | ||
} | ||
''; | ||
LilleAila marked this conversation as resolved.
Show resolved
Hide resolved
|
||
description = "Custom highlights to apply"; | ||
}; | ||
|
||
config = { | ||
vim.luaConfigRC.highlight = let | ||
highlights = | ||
mapAttrsToList ( | ||
name: value: ''vim.api.nvim_set_hl(0, ${toLuaObject name}, ${toLuaObject value})'' | ||
) | ||
cfg; | ||
in | ||
entryBetween ["lazyConfigs" "pluginConfigs" "extraPluginConfigs"] ["theme"] (concatLines highlights); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. CC @horriblename on this. I'm not actually sure where There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wrote it based on the code in |
||
}; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a blocker, but these may be better suited for the extended lib.