From 27c8d275c501590a3510307e0b58f54156fd2e53 Mon Sep 17 00:00:00 2001
From: LeMarsu <ch.ruelle@lemarsu.com>
Date: Sat, 28 Feb 2026 00:56:00 +0100
Subject: [PATCH] refactor: simplify configuration creation

---
 lib/mkNeovimPkg.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/mkNeovimPkg.nix b/lib/mkNeovimPkg.nix
index c1366f8..9852686 100644
--- a/lib/mkNeovimPkg.nix
+++ b/lib/mkNeovimPkg.nix
@@ -86,18 +86,20 @@
     then deps.textOrContent init
     else buildInit (optionalAttrs (! isNull init) init);
 
-  neovimConfig =
-    pkgs.neovimUtils.makeNeovimConfig {
-      inherit customRC;
-      plugins = extractPlugins plugins;
-      extraLuaPackages = ps:
-        (extractLuaPackagesFn plugins ps) ++ (extraLuaPackages ps);
-    }
-    // {luaRcContent = customRC;};
-  params =
-    removeAttrs neovimConfig ["manifestRc" "neovimRcContent"]
-    // {inherit viAlias vimAlias;};
-  pkg = pkgs.wrapNeovimUnstable package params;
+  neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
+    # inherit customRC;
+    customLuaRC = customRC;
+    plugins = extractPlugins plugins;
+    extraLuaPackages = ps:
+      (extractLuaPackagesFn plugins ps) ++ (extraLuaPackages ps);
+    inherit viAlias vimAlias;
+    # autoconfigure = false;
+  };
+  # // {luaRcContent = customRC;};
+  # params =
+  #   removeAttrs neovimConfig ["neovimRcContent"]
+  #   // {inherit viAlias vimAlias;};
+  pkg = pkgs.wrapNeovimUnstable package neovimConfig;
   mkDiffAlias = name:
     (flip optionalString) ''
       cat <<SH > $out/bin/${name}