diff --git a/flake.lock b/flake.lock index 24f10073..1c95e2c7 100644 --- a/flake.lock +++ b/flake.lock @@ -668,18 +668,18 @@ "linux-asus": { "flake": false, "locked": { - "lastModified": 1766306646, - "narHash": "sha256-xDjM8XkKOhIMTenpjjWuQFDSM3RBA/tPWNSbOd1MDdQ=", - "owner": "asus-linux", + "lastModified": 1767457777, + "narHash": "sha256-DCKTOfkJ0d1IkSwcSq0r/j45BvkBDcqXVmJAVYRFHSU=", + "owner": "CHN-beta", "repo": "linux-g14", - "rev": "35bffaf767dd85280adc54958038dbe9d8041d68", - "type": "gitlab" + "rev": "c02087ae1c3f9d24bdcf2b4b277ce0b4c9fd767c", + "type": "github" }, "original": { - "owner": "asus-linux", + "owner": "CHN-beta", "ref": "6.18", "repo": "linux-g14", - "type": "gitlab" + "type": "github" } }, "mac-style": { diff --git a/flake.nix b/flake.nix index 556ea55c..f3a7c0fc 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ mirism-old = { url = "github:CHN-beta/mirism-old-public"; flake = false; }; sqlgen = { url = "git+https://github.com/getml/sqlgen?submodules=1"; flake = false; }; reflectcpp = { url = "git+https://github.com/getml/reflect-cpp?submodules=1"; flake = false; }; - linux-asus = { url = "gitlab:asus-linux/linux-g14/6.18"; flake = false; }; + linux-asus = { url = "github:CHN-beta/linux-g14/6.18"; flake = false; }; }; outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix index 3ece4f83..4b076632 100644 --- a/modules/system/kernel.nix +++ b/modules/system/kernel.nix @@ -70,13 +70,38 @@ inputs: asus = builtins.map (file: { - name = "asus-${file.name}"; - patch = "${inputs.topInputs.linux-asus}/${file.name}"; + name = "asus-${file}"; + patch = "${inputs.topInputs.linux-asus}/${file}"; }) - (builtins.filter - (file: file.value == "regular" && inputs.lib.hasSuffix ".patch" file.name - && !(inputs.lib.hasInfix "more-uarches" file.name)) - (inputs.localLib.attrsToList (builtins.readDir "${inputs.topInputs.linux-asus}"))); + [ + # copy from PKGBUILD + "0001-platform-x86-asus-wmi-export-symbols-used-for-read-w.patch" + "0002-platform-x86-asus-armoury-move-existing-tunings-to-a.patch" + "0003-platform-x86-asus-armoury-add-panel_hd_mode-attribut.patch" + "0004-platform-x86-asus-armoury-add-apu-mem-control-suppor.patch" + "0005-platform-x86-asus-armoury-add-screen-auto-brightness.patch" + "0006-platform-x86-asus-wmi-deprecate-bios-features.patch" + "0007-platform-x86-asus-wmi-rename-ASUS_WMI_DEVID_PPT_FPPT.patch" + "0008-platform-x86-asus-armoury-add-ppt_-and-nv_-tuning-kn.patch" + "0001-platform-x86-asus-armoury-Fix-error-code-in-mini_led.patch" + "0002-platform-x86-asus-armoury-fix-mini-led-mode-show.patch" + "0003-platform-x86-asus-armoury-add-support-for-FA507UV.patch" + "0001-platform-x86-asus-armoury-fix-only-DC-tunables-being.patch" + "PATCH-v10-00-11-HID-asus-Fix-ASUS-ROG-Laptop-s-Keyboard-backlight-handling.patch" + "PATCH-v10-00-11-HID-asus-Fix-ASUS-ROG-Laptop-s-Keyboard-backlight-handling-id1-id2-pr_err.patch" + "0001-platform-x86-asus-wmi-fix-initializing-TUFs-keyboard.patch" + "0002-platform-x86-asus-armoury-add-keyboard-control-firmw.patch" + "0001-acpi-proc-idle-skip-dummy-wait.patch" + "PATCH-v5-00-11-Improvements-to-S5-power-consumption.patch" + "PATCH-asus-wmi-fixup-screenpad-brightness.patch" + "asus-patch-series.patch" + "0070-acpi-x86-s2idle-Add-ability-to-configure-wakeup-by-A.patch" + "0040-workaround_hardware_decoding_amdgpu.patch" + "0081-amdgpu-adjust_plane_init_off_by_one.patch" + "0084-enable-steam-deck-hdr.patch" + "sys-kernel_arch-sources-g14_files-0047-asus-nb-wmi-Add-tablet_mode_sw-lid-flip.patch" + "sys-kernel_arch-sources-g14_files-0048-asus-nb-wmi-fix-tablet_mode_sw_int.patch" + ]; }; in builtins.concatLists (builtins.map (name: patches.${name}) kernel.patches); };