Merge e43b18cb9f into 8ff50562d7

honestly raf was cooking with this one.
it's much nicer to use compared to interpolation lol

configuration.nix

@@ -168,21 +168,23 @@ isMaximal: {
 
         precognition = {
           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;
+              };
             };
           };
         };

modules/plugins/utility/motion/precognition/config.nix

@@ -4,9 +4,6 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (builtins) toString;
 
   cfg = config.vim.utility.motion.precognition;
 in {
@@ -17,15 +14,8 @@ in {
         "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}),
-        });
       '';
     };
 }

modules/plugins/utility/motion/precognition/default.nix

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

modules/plugins/utility/motion/precognition/precognition.nix

@@ -1,6 +1,7 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.types) attrsOf listOf str bool int submodule;
+  inherit (lib.nvim.types) mkPluginSetupOption;
 
   mkHintType = description:
     mkOption {
@@ -25,41 +26,42 @@ in {
   options.vim.utility.motion.precognition = {
     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"]'';
     };
   };
 }