From 1e3f630aa9722fbacc3d44f553e5a8c10772b8bd Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 25 Nov 2025 13:17:16 +0800 Subject: [PATCH] flake: remove linux-asus patch --- flake.lock | 18 ------------------ flake.nix | 1 - modules/hardware/asus/default.nix | 1 - modules/system/kernel/default.nix | 10 ---------- 4 files changed, 30 deletions(-) diff --git a/flake.lock b/flake.lock index 5e19ce18..b9dadbff 100644 --- a/flake.lock +++ b/flake.lock @@ -553,23 +553,6 @@ "type": "github" } }, - "linux-asus": { - "flake": false, - "locked": { - "lastModified": 1763490343, - "narHash": "sha256-aiCPWxyVBNfqB8Gw9OwrrEP3c+liUBZbEW6aTIrd+TE=", - "owner": "asus-linux", - "repo": "linux-g14", - "rev": "29faef816326f31b4d9d3e19c1f9a8ffe9005e8a", - "type": "gitlab" - }, - "original": { - "owner": "asus-linux", - "ref": "6.17", - "repo": "linux-g14", - "type": "gitlab" - } - }, "mac-style": { "flake": false, "locked": { @@ -1269,7 +1252,6 @@ "home-manager": "home-manager", "impermanence": "impermanence", "lepton": "lepton", - "linux-asus": "linux-asus", "mac-style": "mac-style", "matplotplusplus": "matplotplusplus", "mirism-old": "mirism-old", diff --git a/flake.nix b/flake.nix index 25ce09fe..a2308029 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,6 @@ pybinding = { url = "git+https://github.com/dean0x7d/pybinding?submodules=1"; flake = false; }; brokenaxes = { url = "github:bendichter/brokenaxes"; flake = false; }; mirism-old = { url = "github:CHN-beta/mirism-old-public"; flake = false; }; - linux-asus = { url = "gitlab:asus-linux/linux-g14/6.17"; flake = false; }; }; outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in diff --git a/modules/hardware/asus/default.nix b/modules/hardware/asus/default.nix index 74ac62ba..8defc6e4 100644 --- a/modules/hardware/asus/default.nix +++ b/modules/hardware/asus/default.nix @@ -10,6 +10,5 @@ inputs: supergfxd.enable = false; }; programs.rog-control-center = { enable = true; autoStart = true; }; - nixos.system.kernel.patches = [ "asus" ]; }; } diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 41e0f847..309619c8 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -80,16 +80,6 @@ inputs: }; structuredExtraConfig.BTRFS_EXPERIMENTAL = inputs.lib.kernel.yes; }]; - asus = builtins.map - (file: - { - name = "asus-${file.name}"; - patch = "${inputs.topInputs.linux-asus}/${file.name}"; - }) - (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}"))); }; in builtins.concatLists (builtins.map (name: patches.${name}) kernel.patches); };