From b49cecc1f1ab5f883da58627eee4ce638be8278d Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 29 Aug 2025 21:29:56 -0400
Subject: [PATCH] modules/kernel: in-tree kernel modules are now in a separate
 derivation output

---
 modules/boot/kernel.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/boot/kernel.nix b/modules/boot/kernel.nix
index 918e7d7..313bb34 100644
--- a/modules/boot/kernel.nix
+++ b/modules/boot/kernel.nix
@@ -192,7 +192,8 @@
   };
 
   config = lib.mkIf config.boot.kernel.enable {
-    system.modulesTree = [ config.boot.kernelPackages.kernel ] ++ config.boot.extraModulePackages;
+    # use split output for modules, when available
+    system.modulesTree = [ (config.boot.kernelPackages.kernel.modules or config.boot.kernelPackages.kernel) ] ++ config.boot.extraModulePackages;
 
     boot.kernelModules = [ "loop" "atkbd" ];