Revert "flake: remove linux-asus patch"

This reverts commit 1e3f630aa9.
This commit is contained in:
2026-01-03 22:58:52 +08:00
parent c86ebb17f4
commit ef99027542
4 changed files with 30 additions and 0 deletions

18
flake.lock generated
View File

@@ -665,6 +665,23 @@
"type": "github" "type": "github"
} }
}, },
"linux-asus": {
"flake": false,
"locked": {
"lastModified": 1766306646,
"narHash": "sha256-xDjM8XkKOhIMTenpjjWuQFDSM3RBA/tPWNSbOd1MDdQ=",
"owner": "asus-linux",
"repo": "linux-g14",
"rev": "35bffaf767dd85280adc54958038dbe9d8041d68",
"type": "gitlab"
},
"original": {
"owner": "asus-linux",
"ref": "6.18",
"repo": "linux-g14",
"type": "gitlab"
}
},
"mac-style": { "mac-style": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -1442,6 +1459,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"lepton": "lepton", "lepton": "lepton",
"linux-asus": "linux-asus",
"mac-style": "mac-style", "mac-style": "mac-style",
"matplotplusplus": "matplotplusplus", "matplotplusplus": "matplotplusplus",
"mirism-old": "mirism-old", "mirism-old": "mirism-old",

View File

@@ -65,6 +65,7 @@
mirism-old = { url = "github:CHN-beta/mirism-old-public"; flake = false; }; mirism-old = { url = "github:CHN-beta/mirism-old-public"; flake = false; };
sqlgen = { url = "git+https://github.com/getml/sqlgen?submodules=1"; 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; }; 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; };
}; };
outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in

View File

@@ -10,5 +10,6 @@ inputs:
supergfxd.enable = false; supergfxd.enable = false;
}; };
programs.rog-control-center.enable = true; programs.rog-control-center.enable = true;
nixos.system.kernel.patches = [ "asus" ];
}; };
} }

View File

@@ -67,6 +67,16 @@ inputs:
patches = patches =
{ {
btrfs = [(inputs.topInputs.self.src.btrfs.${version} // { name = "btrfs"; })]; btrfs = [(inputs.topInputs.self.src.btrfs.${version} // { name = "btrfs"; })];
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); in builtins.concatLists (builtins.map (name: patches.${name}) kernel.patches);
}; };