Merge 7f5c33605d into 6eb5bea5ba

docs/manual/configuring/custom-plugins/configuring.md

@@ -11,8 +11,8 @@ be used if the plugin uses a `require('module').setup(...)` pattern. Otherwise,
 ```nix
 {
   config.vim.lazy.plugins = {
-    aerial.nvim = {
-    # ^^^^^^^^^ this name should match the package.pname or package.name
+    aerial-nvim = {
+      # ^^^^^^^^^ this name should match the package.pname or package.name
       package = aerial-nvim;
 
       setupModule = "aerial";

docs/manual/configuring/custom-plugins/lazy-method.md

@@ -6,9 +6,9 @@ As of version **0.7**, we exposed an API for configuring lazy-loaded plugins via
 ```nix
 {
   config.vim.lazy.plugins = {
-    "aerial.nvim" = {
+    aerial = {
       package = pkgs.vimPlugins.aerial-nvim;
-      setupModule = "aerial";
+      setupModule = aerial;
       setupOpts = {
         option_name = true;
       };

modules/default.nix

@@ -128,10 +128,9 @@ in {
     # will return the configuration in full.
     passthru.neovimConfig = vimOptions;
 
-    meta =
-      neovim-wrapped.meta
-      // {
-        description = "Wrapped Neovim package with helper scripts to print the config (path)";
-      };
+    meta = {
+      description = "Wrapped version of Neovim with additional helper scripts";
+      mainProgram = "nvim";
+    };
   };
 }

modules/wrapper/lazy/lazy.nix

@@ -62,7 +62,7 @@
       };
 
       setupOpts = mkOption {
-        type = attrsOf anything;
+        type = submodule {freeformType = attrsOf anything;};
         description = "Options to pass to the setup function";
         default = {};
       };