From 61fcc9de76b88e55578eb5d79fc80f2b236df707 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 20 Dec 2025 19:42:05 -0600
Subject: [PATCH] tests/neovim: add test to catch config eval

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../modules/programs/neovim/plugin-config.nix | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/tests/modules/programs/neovim/plugin-config.nix b/tests/modules/programs/neovim/plugin-config.nix
index 466cede40..5b198dedd 100644
--- a/tests/modules/programs/neovim/plugin-config.nix
+++ b/tests/modules/programs/neovim/plugin-config.nix
@@ -34,15 +34,25 @@ lib.mkIf config.test.enableBig {
 
   _module.args.pkgs = lib.mkForce realPkgs;
 
-  nmt.script = ''
-    vimout=$(mktemp)
-    echo "redir >> /dev/stdout | echo g:hmExtraConfig | echo g:hmPlugins | redir END" \
-      | ${pkgs.neovim}/bin/nvim -es -u "$TESTED/home-files/.config/nvim/init.lua" \
-      > "$vimout" || true
-    assertFileContains "$vimout" "HM_EXTRA_CONFIG"
-    assertFileContains "$vimout" "HM_PLUGINS_CONFIG"
+  nmt.script =
+    let
+      # Force evaluation of generatedConfigs.
+      luaConfig = config.programs.neovim.generatedConfigs.lua;
+      vimlConfig = config.programs.neovim.generatedConfigs.viml;
+    in
+    ''
+      vimout=$(mktemp)
+      echo "redir >> /dev/stdout | echo g:hmExtraConfig | echo g:hmPlugins | redir END" \
+        | ${pkgs.neovim}/bin/nvim -es -u "$TESTED/home-files/.config/nvim/init.lua" \
+        > "$vimout" || true
+      assertFileContains "$vimout" "HM_EXTRA_CONFIG"
+      assertFileContains "$vimout" "HM_PLUGINS_CONFIG"
 
-    initLua="$TESTED/home-files/.config/nvim/init.lua"
-    assertFileContent $(normalizeStorePaths "$initLua") ${./plugin-config.expected}
-  '';
+      initLua="$TESTED/home-files/.config/nvim/init.lua"
+      assertFileContent $(normalizeStorePaths "$initLua") ${./plugin-config.expected}
+
+      # Verify generatedConfigs evaluated properly (issue #8371)
+      echo "Lua config length: ${toString (builtins.stringLength luaConfig)}"
+      echo "Viml config length: ${toString (builtins.stringLength vimlConfig)}"
+    '';
 }