Compare commits

...

3 commits

Author SHA1 Message Date
Nowaaru
e43b18cb9f
utility/precognition: format 2024-11-05 04:20:11 -07:00
Nowaaru
b0641a8c0b
utility/precognition: remove unnecessary function parameter 2024-11-05 04:13:22 -07:00
Nowaaru
517a6aa06e
utility/precognition: convert to setupOpts
honestly raf was cooking with this one.
it's much nicer to use compared to interpolation lol
2024-11-04 23:40:44 -07:00
4 changed files with 50 additions and 56 deletions

View file

@ -168,21 +168,23 @@ isMaximal: {
precognition = { precognition = {
enable = true; enable = true;
startVisible = true; setupOpts = {
showBlankVirtLine = true; startVisible = true;
showBlankVirtLine = true;
# highlightColor - automatically set by theme # highlightColor - automatically set by theme
disabled_fts = ["startify" "alpha" "dashboard"]; disabled_fts = ["startify" "alpha" "dashboard"];
gutterHints = { gutterHints = {
gg = { gg = {
text = "gg"; text = "gg";
prio = 2; prio = 2;
};
}; };
}; hints = {
hints = { Caret = {
Caret = { text = "^";
text = "^"; prio = 10;
prio = 10; };
}; };
}; };
}; };

View file

@ -4,9 +4,6 @@
... ...
}: let }: let
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject;
inherit (builtins) toString;
cfg = config.vim.utility.motion.precognition; cfg = config.vim.utility.motion.precognition;
in { in {
@ -17,15 +14,8 @@ in {
"precognition-nvim" "precognition-nvim"
]; ];
vim.pluginRC.precognition-nvim = entryAnywhere '' vim.luaConfigRC.precognition = lib.nvim.dag.entryAnywhere ''
require("precognition").setup({ require('precognition').setup(${lib.nvim.lua.toLuaObject cfg.setupOpts})
startVisible = ${toString cfg.startVisible},
showBlankVirtLine = ${toString cfg.showBlankVirtLine},
highlightColor = (${toLuaObject cfg.highlightColor}), --{ link = "Comment" },
hints = (${toLuaObject cfg.hints}),
gutterHints = (${toLuaObject cfg.gutterHints}),
disabled_fts = (${toLuaObject cfg.disabled_fts}),
});
''; '';
}; };
} }

View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./precognition.nix ./precognition.nix
./config.nix ./config.nix

View file

@ -1,6 +1,7 @@
{lib, ...}: let {lib, ...}: let
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.types) attrsOf listOf str bool int submodule; inherit (lib.types) attrsOf listOf str bool int submodule;
inherit (lib.nvim.types) mkPluginSetupOption;
mkHintType = description: mkHintType = description:
mkOption { mkOption {
@ -25,41 +26,42 @@ in {
options.vim.utility.motion.precognition = { options.vim.utility.motion.precognition = {
enable = mkEnableOption "precognition.nvim plugin"; enable = mkEnableOption "precognition.nvim plugin";
startVisible = mkOption { setupOpts = mkPluginSetupOption "precognition.nvim" {
type = bool; startVisible = mkOption {
description = "Whether to start 'precognition' automatically."; type = bool;
default = true; description = "Whether to start 'precognition' automatically.";
}; default = true;
};
showBlankVirtLine = mkOption { showBlankVirtLine = mkOption {
type = bool; type = bool;
description = "Whether to show a blank virtual line when no movements are shown."; description = "Whether to show a blank virtual line when no movements are shown.";
default = true; default = true;
}; };
highlightColor = mkOption { highlightColor = mkOption {
type = attrsOf str; type = attrsOf str;
default = {link = "Comment";};
example = literalExpression ''
{ link = "Comment"; }
# or
{ foreground = "#0000FF"; background = "#000000"; };
'';
description = ''
The highlight for the virtual text.
'';
};
example = literalExpression '' hints = mkHintType "What motions display and at what priority.";
{ link = "Comment"; }
# or
{ foreground = "#0000FF"; background = "#000000"; };
'';
default = {link = "Comment";};
description = ''
The highlight for the virtual text.
'';
};
hints = mkHintType "What motions display and at what priority."; gutterHints =
mkHintType "What motions display and at what priority. Only appears in gutters.";
gutterHints = disabled_fts = mkOption {
mkHintType "What motions display and at what priority. Only appears in gutters."; type = listOf str;
default = ["startify"];
disabled_fts = mkOption { example = literalExpression ''["startify"]'';
type = listOf str; };
default = ["startify"];
example = literalExpression ''["startify"]'';
}; };
}; };
} }