From 780d3eec7209c7a08a585f5b680ed359ed68e62c Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 20 Jan 2025 14:00:08 +0000
Subject: [PATCH] wrappers/standalone: simplify `extend`

---
 wrappers/standalone.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/wrappers/standalone.nix b/wrappers/standalone.nix
index 724ef418..694cf6cb 100644
--- a/wrappers/standalone.nix
+++ b/wrappers/standalone.nix
@@ -32,25 +32,19 @@ let
   mkNvim =
     mod:
     let
+      modules = lib.toList mod;
       nixvimConfig = evalNixvim {
-        modules = [
-          mod
+        modules = modules ++ [
           systemMod
         ];
         inherit extraSpecialArgs;
       };
+      extend = extension: mkNvim (modules ++ lib.toList extension);
     in
     nixvimConfig.config.build.package.overrideAttrs (old: {
-      passthru = old.passthru or { } // rec {
+      passthru = old.passthru or { } // {
         inherit (nixvimConfig) config options;
-        extend =
-          extension:
-          mkNvim {
-            imports = [
-              mod
-              extension
-            ];
-          };
+        inherit extend;
         nixvimExtend = lib.warn "<nixvim>.nixvimExtend has been renamed to <nixvim>.extend" extend;
       };
     });