From bb9a1bfb68b735899f022f03bfefb877c52592d4 Mon Sep 17 00:00:00 2001 From: chn Date: Sat, 20 Jan 2024 11:10:13 +0800 Subject: [PATCH] Revert "surface: remove patch from nixos-hardware" This reverts commit 9d8442b1cfc6b7f6c1d284e78e34833dab773ead. --- devices/surface/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/devices/surface/default.nix b/devices/surface/default.nix index bf08c105..488fdd6a 100644 --- a/devices/surface/default.nix +++ b/devices/surface/default.nix @@ -1,5 +1,6 @@ inputs: { + imports = inputs.localLib.mkModules [ inputs.topInputs.nixos-hardware.nixosModules.microsoft-surface-pro-intel ]; config = { nixos = @@ -61,5 +62,21 @@ inputs: }; bugs = [ "xmunet" ]; }; + boot.kernelPackages = + let + originalKernel = inputs.pkgs.linuxPackages_xanmod_latest.kernel; + version = originalKernel.version; + majorVersion = + let versionArray = builtins.splitVersion version; + in "${builtins.elemAt versionArray 0}.${builtins.elemAt versionArray 1}"; + repoFile = "${inputs.topInputs.nixos-hardware}/microsoft/surface/common/kernel/linux-package.nix"; + inherit (inputs.pkgs.callPackage repoFile {}) repos; + patchDir = repos.linux-surface + "/patches/${majorVersion}"; + patchFile = "${inputs.topInputs.nixos-hardware}/microsoft/surface/common/kernel/linux-6.6.x/patches.nix"; + kernelPatches = inputs.pkgs.callPackage patchFile { inherit (inputs.lib) kernel; inherit version patchDir; }; + in + inputs.lib.mkForce (inputs.pkgs.linuxPackagesFor (originalKernel.override + (prev: { kernelPatches = prev.kernelPatches ++ kernelPatches; }))); + systemd.services.iptsd.enable = false; }; }