chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2024-10-23 04:58:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

devices.pc: switch to cachyos

Browse Source
This commit is contained in:
陈浩南 2024-03-17 13:05:05 +08:00
parent 7daf2a0a19
commit 5b67ec05cf
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/pc/default.nix
View File

@ -54,7 +54,7 @@ inputs:
};
nixpkgs =
{ march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
kernel.patches = [ "cjktty" "lantian" "hibernate-progress" ];
kernel = { varient = "cachyos"; patches = [ "cjktty" "hibernate-progress" ]; };
networking.hostname = "pc";
sysctl.laptop-mode = 5;
};

25
flake.lock
View File

@ -94,16 +94,17 @@
"yafas": "yafas"
},
"locked": {
"lastModified": 1710512612,
"narHash": "sha256-XMyG8ceRZ3aIqSJy/XlJHzkOaNCudldWq8Zrn2NfgcA=",
"lastModified": 1710340554,
"narHash": "sha256-oMeBMZmLEcqPQ3DBG1xVhSm9+dV+ZNxaYn3wfro2p70=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "4417bbe33cb131959a9635815faa092c0934b36b",
"rev": "03b2bea544688068025df1912ff1e9a1ad4a642a",
"type": "github"
},
"original": {
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "03b2bea544688068025df1912ff1e9a1ad4a642a",
"type": "github"
}
},
@ -187,11 +188,11 @@
]
},
"locked": {
"lastModified": 1710090208,
"narHash": "sha256-1W7yDW+kqCr/9SygZwygBayE8HwLnzJq48fMAOZQLAY=",
"lastModified": 1710562188,
"narHash": "sha256-KHlb4sK9fvp+9DoYWHLyaegoeLV7w8s7CsNMmNlKu1U=",
"owner": "girlbossceo",
"repo": "conduwuit",
"rev": "e888a0a745ac979abe6a687ff24b8c5e7b7b79ed",
"rev": "8d8467a4eafd264adb9c710e0638c08ae547dec4",
"type": "github"
},
"original": {
@ -1000,11 +1001,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1710484139,
"narHash": "sha256-vOm70QgvfjHNQa9vmpxPsm1xE4PTmqtkDpe22/ra5cw=",
"lastModified": 1710563757,
"narHash": "sha256-H5SZIo7O4zg/NqSdM71V2gYH4ex5WbBf6s9ue5s4nL4=",
"owner": "martinvonz",
"repo": "jj",
"rev": "3bb9fd412ac7f021a2fa09503fdec93ac066d7b7",
"rev": "8600750fceafbf489d42a99b36b1f48bbc1e416b",
"type": "github"
},
"original": {
@ -1172,11 +1173,11 @@
]
},
"locked": {
"lastModified": 1710494976,
"narHash": "sha256-WDuSPzeKecrolclXHmPk44Ch28+DQXHqYFOJkHSWFgM=",
"lastModified": 1710525749,
"narHash": "sha256-LpV/mJLeShTPecVQZnIAb9PTCGziuMuGOJQUeAb2u/w=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "642c6e7512f25f1fdc47dfa6a6eaec38c5faa69b",
"rev": "0c57815fbf47c69af9ed11fa8ebc1b52158a3ba2",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -40,7 +40,7 @@
nix-flatpak.url = "github:gmodena/nix-flatpak";
chaotic =
{
url = "github:chaotic-cx/nyx";
url = "github:chaotic-cx/nyx?rev=03b2bea544688068025df1912ff1e9a1ad4a642a";
inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; };
};

12
modules/system/kernel/default.nix
View File

@ -2,7 +2,11 @@ inputs:
{
options.nixos.system.kernel = let inherit (inputs.lib) mkOption types; in
{
varient = mkOption { type = types.enum [ "lts" "latest" ]; default = "lts"; };
varient = mkOption
{
type = types.enum [ "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" ];
default = "xanmod-lts";
};
patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
modules =
{
@ -36,8 +40,10 @@ inputs:
kernelParams = [ "delayacct" "acpi_osi=Linux" "acpi.ec_no_wakeup=1" ];
kernelPackages =
{
lts = inputs.pkgs.linuxPackages_xanmod;
latest = inputs.pkgs.linuxPackages_xanmod_latest;
xanmod-lts = inputs.pkgs.linuxPackages_xanmod;
xanmod-latest = inputs.pkgs.linuxPackages_xanmod_latest;
cachyos = inputs.pkgs.linuxPackages_cachyos;
cachyos-lto = inputs.pkgs.linuxPackages_cachyos-lto;
}.${kernel.varient};
kernelPatches =
let