Merge 43e6e673af into 2fc7dc798b

lib/types/plugins.nix

@@ -6,7 +6,7 @@
   inherit (lib.options) mkOption;
   inherit (lib.attrsets) attrNames mapAttrs' filterAttrs nameValuePair;
   inherit (lib.strings) hasPrefix removePrefix;
-  inherit (lib.types) submodule either package enum str lines attrsOf anything listOf nullOr oneOf bool int;
+  inherit (lib.types) submodule either package enum str lines attrsOf anything listOf nullOr oneOf bool;
   # Get the names of all flake inputs that start with the given prefix.
   fromInputs = {
     inputs,
@@ -138,18 +138,6 @@
 
       # lz.n options
 
-      enabled = mkOption {
-        type = nullOr (either bool str);
-        description = "When false, or if the lua function returns false, this plugin will not be included in the spec";
-        default = null;
-      };
-
-      beforeAll = mkOption {
-        type = nullOr str;
-        description = "Lua code to run before any plugins are loaded. This will be wrapped in a function.";
-        default = null;
-      };
-
       before = mkOption {
         type = nullOr str;
         description = "Lua code to run before plugin is loaded. This will be wrapped in a function.";
@@ -207,27 +195,7 @@
         '';
       };
 
-      colorscheme = mkOption {
-        description = "Lazy-load on colorscheme.";
-        type = nullOr (either str (listOf str));
-        default = null;
-      };
-
-      priority = mkOption {
-        type = nullOr int;
-        description = "Only useful for stat plugins (not lazy-loaded) to force loading certain plugins first.";
-        default = null;
-      };
-
-      load = mkOption {
-        type = str;
-        default = null;
-        description = ''
-          Lua code to override the `vim.g.lz_n.load()` function for a single plugin.
-
-          This will be wrapped in a function
-        '';
-      };
+      # TODO: enabled, beforeAll, colorscheme, priority, load
     };
   };
 in {

modules/neovim/mappings/options.nix

@@ -44,7 +44,23 @@
 
   # legacy stuff
   mapOption = submodule {
-    options = mapConfigOptions;
+    options =
+      mapConfigOptions
+      // {
+        action = mkOption {
+          type = str;
+          description = "The action to execute.";
+        };
+
+        lua = mkOption {
+          type = bool;
+          description = ''
+            If true, `action` is considered to be lua code.
+            Thus, it will not be wrapped in `""`.
+          '';
+          default = false;
+        };
+      };
   };
 
   mapOptions = mode:

modules/wrapper/rc/config.nix

@@ -37,7 +37,7 @@ in {
       else keymap.action;
 
     getOpts = keymap: {
-      inherit (keymap) desc silent nowait script expr unique noremap;
+      inherit (keymap) silent nowait script expr unique noremap;
     };
 
     toLuaKeymap = {