From 5e2d4a61d41ae6330fa5d47dbf78a88dc6921f2b Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Wed, 25 Dec 2024 23:58:16 +0100
Subject: [PATCH] Respect optional setting even for transitional dependencies

---
 nvim/mknvim.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nvim/mknvim.nix b/nvim/mknvim.nix
index 043e211..87bdf66 100644
--- a/nvim/mknvim.nix
+++ b/nvim/mknvim.nix
@@ -55,8 +55,11 @@
     plugs = (map (normalize false) plugins.start) ++ (map (normalize true) plugins.opts);
     allPlugs = lib.unique (builtins.concatMap withDeps plugs);
     partitioned = builtins.partition (p: p.optional) (preparePlugins allPlugs);
-    start = [(pack.packPlugins partitioned.wrong).plugin];
     opt = map (p: p.plugin) partitioned.right;
+    start = let
+      # remove plugins marked as "optional" from the start pack
+      startPlugs = builtins.filter (p: !(builtins.elem p.plugin opt)) partitioned.wrong;
+    in [(pack.packPlugins startPlugs).plugin];
   in
     pkgs.neovimUtils.packDir {packages = {inherit start opt;};};