From 3f98e2bbc661ec0aaf558d8a283d6955f05f1d09 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Mon, 9 Mar 2026 22:52:33 +0100
Subject: [PATCH] neovim: reference neovim-unwrapped lua

less opportunities to mess the reference up by referencing unwrapped's lua directly.
---
 modules/programs/neovim.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index 57feccab..a08a15ac 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -414,12 +414,19 @@ in
       ) allPlugins;
 
       # remove attributes not understood by nixpkgs' "makeVimPackageInfo"
-      suppressIncompatibleConfig = p: lib.filterAttrs
-        (n: v: builtins.elem n ["plugin" "optional" "config"])
-        (if p.type != "viml" then p // { config = null; } else p);
+      suppressIncompatibleConfig =
+        p:
+        lib.filterAttrs (
+          n: v:
+          builtins.elem n [
+            "plugin"
+            "optional"
+            "config"
+          ]
+        ) (if p.type != "viml" then p // { config = null; } else p);
 
       # Lua & Python Package Resolution
-      luaPackages = cfg.finalPackage.unwrapped.lua.pkgs;
+      luaPackages = cfg.package.lua.pkgs;
       resolvedExtraLuaPackages = cfg.extraLuaPackages luaPackages;
 
       # Wrapper Arguments Construction