From c12842ea3c7b247c1e66ed3b065ce35bb77b3dc8 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Fri, 5 Dec 2025 09:36:28 +0800
Subject: [PATCH] fix kernel 6.18 build

---
 modules/hardware/default.nix | 3 ++-
 modules/packages/desktop.nix | 1 +
 modules/system/kernel.nix    | 7 ++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index e901a488..81371f95 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -13,7 +13,8 @@ inputs:
     { joystick = genericOption; printer = genericOption; sound = genericOption; bolt = genericOption; };
   config = let inherit (inputs.config.nixos) hardware; in inputs.lib.mkMerge
   [
-    (inputs.lib.mkIf (hardware.joystick != null) { hardware = { xone.enable = true; xpadneo.enable = true; }; })
+    # TODO: enable after fix
+    # (inputs.lib.mkIf (hardware.joystick != null) { hardware = { xone.enable = true; xpadneo.enable = true; }; })
     (
       inputs.lib.mkIf (hardware.printer != null)
       {
diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix
index 1d96938a..9dc31041 100644
--- a/modules/packages/desktop.nix
+++ b/modules/packages/desktop.nix
@@ -79,6 +79,7 @@ inputs:
       [{
         config =
         {
+          # TODO: use nixos module, enable kernel module
           programs.obs-studio =
           {
             enable = true;
diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix
index 1f002401..140a97e2 100644
--- a/modules/system/kernel.nix
+++ b/modules/system/kernel.nix
@@ -45,11 +45,8 @@ inputs:
       ]
         # touchscreen for one
         ++ (inputs.lib.optionals (inputs.config.nixos.model.arch == "x86_64") [ "pinctrl-tigerlake" ]);
-      extraModulePackages = with inputs.config.boot.kernelPackages;
-      [
-        v4l2loopback
-        (if inputs.pkgs.stdenv.hostPlatform.linuxArch == "x86_64" then zenpower else inputs.pkgs.emptyDirectory)
-      ];
+      extraModulePackages = inputs.lib.optionals (inputs.pkgs.stdenv.hostPlatform.linuxArch == "x86_64")
+        [ inputs.config.boot.kernelPackages.zenpower ];
       # force i2c-hid-acpi to load after pinctrl-tigerlake
       extraModprobeConfig = "softdep i2c-hid-acpi pre: pinctrl-tigerlake";
       kernelParams = inputs.lib.mkMerge