-
-
Notifications
You must be signed in to change notification settings - Fork 67
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
Merged
Merged
highlight: init #571
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
fcb6f82
highlight: init
LilleAila 5e3a0dc
highlight: cterm as enum
LilleAila 653e5d6
highlight: implement suggestions
LilleAila 28bbe89
highlight: example without ''
LilleAila f58f416
highlight: :h reference in single quotes
LilleAila e3d99f2
Merge branch 'main' into highlight-options
LilleAila File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
imports = [ | ||
./basic.nix | ||
./debug.nix | ||
./highlight.nix | ||
./spellcheck.nix | ||
]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"; | ||
NotAShelf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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); | ||
NotAShelf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.