flake.lock

@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1746338991,
+        "lastModified": 1746230955,
-        "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=",
+        "narHash": "sha256-X32sM3RQ3X2y6PzfNnX3rhUAlhuITdDOdfSrwZXjlsQ=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1",
+        "rev": "2a1678ba8e4807bd855dd0da94ea2bef5bca733d",
         "type": "github"
       },
       "original": {

modules/wrapper/build/config.nix

@@ -62,14 +62,17 @@
       filter (f: f != null) plugins
     );
 
+  # built (or "normalized") plugins that are modified
+  builtStartPlugins = buildConfigPlugins config.vim.startPlugins;
+  builtOptPlugins = map (package: package // {optional = true;}) (
+    buildConfigPlugins config.vim.optPlugins
+  );
+
   # Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to
   # generate a wrapped Neovim package.
-  neovim-wrapped = inputs.mnw.lib.wrap {inherit pkgs;} {
+  neovim-wrapped = inputs.mnw.lib.wrap pkgs {
     neovim = config.vim.package;
-    plugins = {
+    plugins = builtStartPlugins ++ builtOptPlugins;
-      start = buildConfigPlugins config.vim.startPlugins;
-      opt = buildConfigPlugins config.vim.optPlugins;
-    };
     appName = "nvf";
     extraBinPath = config.vim.extraPackages;
     initLua = config.vim.builtLuaConfigRC;