Merge 39e27e17a2 into 8ff50562d7

configuration.nix

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

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

@@ -4,6 +4,9 @@
   ...
 }: 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 {
@@ -14,8 +17,15 @@ in {
         "precognition-nvim"
       ];
 
-      vim.luaConfigRC.precognition = lib.nvim.dag.entryAnywhere ''
-        require('precognition').setup(${lib.nvim.lua.toLuaObject cfg.setupOpts})
+      vim.pluginRC.precognition-nvim = entryAnywhere ''
+        require("precognition").setup({
+             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,7 +1,6 @@
 {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 {
@@ -26,42 +25,41 @@ in {
   options.vim.utility.motion.precognition = {
     enable = mkEnableOption "precognition.nvim plugin";
 
-    setupOpts = mkPluginSetupOption "precognition.nvim" {
-      startVisible = mkOption {
-        type = bool;
-        description = "Whether to start 'precognition' automatically.";
-        default = true;
-      };
+    startVisible = mkOption {
+      type = bool;
+      description = "Whether to start 'precognition' automatically.";
+      default = true;
+    };
 
-      showBlankVirtLine = mkOption {
-        type = bool;
-        description = "Whether to show a blank virtual line when no movements are shown.";
-        default = true;
-      };
+    showBlankVirtLine = mkOption {
+      type = bool;
+      description = "Whether to show a blank virtual line when no movements are shown.";
+      default = true;
+    };
 
-      highlightColor = mkOption {
-        type = attrsOf str;
-        default = {link = "Comment";};
-        example = literalExpression ''
-          { link = "Comment"; }
-          # or
-          { foreground = "#0000FF"; background = "#000000"; };
-        '';
-        description = ''
-          The highlight for the virtual text.
-        '';
-      };
+    highlightColor = mkOption {
+      type = attrsOf str;
 
-      hints = mkHintType "What motions display and at what priority.";
+      example = literalExpression ''
+        { link = "Comment"; }
+        # or
+        { foreground = "#0000FF"; background = "#000000"; };
+      '';
+      default = {link = "Comment";};
+      description = ''
+        The highlight for the virtual text.
+      '';
+    };
 
-      gutterHints =
-        mkHintType "What motions display and at what priority. Only appears in gutters.";
+    hints = mkHintType "What motions display and at what priority.";
 
-      disabled_fts = mkOption {
-        type = listOf str;
-        default = ["startify"];
-        example = literalExpression ''["startify"]'';
-      };
+    gutterHints =
+      mkHintType "What motions display and at what priority. Only appears in gutters.";
+
+    disabled_fts = mkOption {
+      type = listOf str;
+      default = ["startify"];
+      example = literalExpression ''["startify"]'';
     };
   };
 }