From eaf74c6f3bba71ba73b63e207d1fda29a204bb3e Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Fri, 29 Nov 2024 13:16:28 +0800
Subject: [PATCH] modules.system.kernel: allow null variant

---
 devices/surface/default.nix       |  2 +-
 flake.lock                        | 10 +++++-----
 flake.nix                         |  2 +-
 modules/system/kernel/default.nix |  5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/devices/surface/default.nix b/devices/surface/default.nix
index eed530ac..9fd227b1 100644
--- a/devices/surface/default.nix
+++ b/devices/surface/default.nix
@@ -26,7 +26,7 @@ inputs:
         };
         nixpkgs.march = "skylake";
         nix = { substituters = [ "https://nix-store.chn.moe?priority=100" ]; githubToken.enable = true; };
-        kernel.patches = [ "surface" "hibernate-progress" ];
+        kernel = { variant = null; patches = [ "hibernate-progress" ]; };
       };
       hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };
       services =
diff --git a/flake.lock b/flake.lock
index bd36cf46..156b4cb1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -879,15 +879,15 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732536142,
-        "narHash": "sha256-DlwQrOBZET55+tOy2eO3DdAmH9B5xSQzj0TcuWClyF8=",
-        "owner": "CHN-beta",
+        "lastModified": 1732483221,
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "20d99c009ced76a49be02d7ba709b2ce5378c806",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
         "type": "github"
       },
       "original": {
-        "owner": "CHN-beta",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 31caa235..01b2c230 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
       inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
     };
     nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nixos-hardware.url = "github:CHN-beta/nixos-hardware";
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
     envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
     nix-flatpak.url = "github:gmodena/nix-flatpak";
     chaotic =
diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix
index 2653a4e6..8fd5fa51 100644
--- a/modules/system/kernel/default.nix
+++ b/modules/system/kernel/default.nix
@@ -4,7 +4,8 @@ inputs:
   {
     variant = mkOption
     {
-      type = types.enum [ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "cachyos-server" "zen" ];
+      type = types.nullOr (types.enum
+        [ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "cachyos-server" "zen" ]);
       default = "xanmod-lts";
     };
     patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
@@ -38,7 +39,7 @@ inputs:
         extraModulePackages = with inputs.config.boot.kernelPackages; [ v4l2loopback zenpower ];
         extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig;
         kernelParams = [ "delayacct" ];
-        kernelPackages =
+        kernelPackages = inputs.lib.mkIf (kernel.variant != null)
         {
           nixos = inputs.pkgs.linuxPackages;
           xanmod-lts = inputs.pkgs.linuxPackages_xanmod;