From 398bc87bc89fc05a3c3731884b16e819c52e2b00 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Sun, 28 Dec 2025 17:23:22 +0100
Subject: [PATCH] neovim: refactor to get rid of makeNeovimConfig

---
 modules/programs/neovim.nix | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index bc3bbac6..15e0374a 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -426,7 +426,10 @@ in
         (concatMapStringsSep ";" luaPackages.getLuaPath resolvedExtraLuaPackages)
       ];
 
-      neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
+      wrappedNeovim' = pkgs.wrapNeovimUnstable cfg.package {
+        withNodeJs = cfg.withNodeJs || cfg.coc.enable;
+        plugins = map suppressNotVimlConfig pluginsNormalized;
+
         inherit (cfg)
           extraPython3Packages
           withPython3
@@ -434,34 +437,19 @@ in
           withPerl
           viAlias
           vimAlias
+          extraName
+          autowrapRuntimeDeps
+          waylandSupport
           ;
-        withNodeJs = cfg.withNodeJs || cfg.coc.enable;
-        plugins = map suppressNotVimlConfig pluginsNormalized;
-        customRC = cfg.extraConfig;
+        neovimRcContent = cfg.extraConfig;
+        wrapperArgs =
+          cfg.extraWrapperArgs ++ extraMakeWrapperArgs ++ extraMakeWrapperLuaCArgs ++ extraMakeWrapperLuaArgs;
+        wrapRc = false;
       };
-
-      wrappedNeovim' = pkgs.wrapNeovimUnstable cfg.package (
-        neovimConfig
-        // {
-          inherit (cfg)
-            extraName
-            autowrapRuntimeDeps
-            waylandSupport
-            withNodeJs
-            ;
-          wrapperArgs =
-            neovimConfig.wrapperArgs
-            ++ cfg.extraWrapperArgs
-            ++ extraMakeWrapperArgs
-            ++ extraMakeWrapperLuaCArgs
-            ++ extraMakeWrapperLuaArgs;
-          wrapRc = false;
-        }
-      );
     in
     {
       programs.neovim = {
-        generatedConfigViml = neovimConfig.neovimRcContent;
+        generatedConfigViml = cfg.extraConfig;
 
         generatedConfigs =
           let