chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:39:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

modules.system.kernel: add cachyos-lts

Browse Source
This commit is contained in:
陈浩南
2025-03-28 20:32:17 +08:00
parent 394b93a658
commit 26f07267f0
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devices/pc/default.nix
View File

@@ -46,7 +46,7 @@ inputs:
kernel =
{
# TODO: switch to cachyos-lts
variant = "xanmod-latest";
variant = "cachyos-lts";
patches = [ "hibernate-progress" ];
};
sysctl.laptop-mode = 5;

16
flake.lock generated
View File

@@ -74,6 +74,21 @@
"url": "https://git.chn.moe/chn/bscpkgs.git"
}
},
"cachyos-lts": {
"locked": {
"lastModified": 1742394059,
"narHash": "sha256-knN9uM2TZX0NvH9mKnpY8ukk4zuTfhljmTYnEAmxfHI=",
"owner": "drakon64",
"repo": "nixos-cachyos-kernel",
"rev": "e585b7a3fca1e7af76da44c4205c87fb53637b70",
"type": "github"
},
"original": {
"owner": "drakon64",
"repo": "nixos-cachyos-kernel",
"type": "github"
}
},
"catppuccin": {
"locked": {
"lastModified": 1734057772,
@@ -1271,6 +1286,7 @@
"blog": "blog",
"blurred-wallpaper": "blurred-wallpaper",
"bscpkgs": "bscpkgs",
"cachyos-lts": "cachyos-lts",
"catppuccin": "catppuccin",
"chaotic": "chaotic",
"concurrencpp": "concurrencpp",

1
flake.nix
View File

@@ -36,6 +36,7 @@
bscpkgs = { url = "git+https://git.chn.moe/chn/bscpkgs.git"; inputs.nixpkgs.follows = "nixpkgs"; };
winapps = { url = "github:winapps-org/winapps/feat-nix-packaging"; inputs.nixpkgs.follows = "nixpkgs"; };
aagl = { url = "github:ezKEa/aagl-gtk-on-nix/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; };
cachyos-lts.url = "github:drakon64/nixos-cachyos-kernel";
misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; };
rsshub = { url = "github:DIYgod/RSSHub"; flake = false; };

2
modules/default.nix
View File

@@ -27,6 +27,8 @@ inputs: let inherit (inputs) topInputs; in
nur-linyinfeng = (topInputs.nur-linyinfeng.overlays.default final prev).linyinfeng;
firefox-addons = (import "${topInputs.rycee}" { inherit (prev) pkgs; }).firefox-addons;
inherit (import topInputs.gricad { pkgs = final; }) intel-oneapi intel-oneapi-2022;
linuxPackages_cachyos_lts =
final.linuxPackagesFor (topInputs.cachyos-lts.overlays.default final prev).linuxPackages_cachyos;
})
];
home-manager.sharedModules =

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

@@ -4,8 +4,7 @@ inputs:
{
variant = mkOption
{
type = types.nullOr (types.enum
[ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "cachyos-server" "zen" ]);
type = types.nullOr (types.enum [ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lts" ]);
default = "xanmod-lts";
};
patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
@@ -45,9 +44,7 @@ inputs:
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;
cachyos-server = inputs.pkgs.linuxPackages_cachyos-server;
zen = inputs.pkgs.linuxPackages_zen;
cachyos-lts = inputs.pkgs.linuxPackages_cachyos_lts;
}.${kernel.variant};
kernelPatches =
let
@@ -86,7 +83,7 @@ inputs:
}
# enable scx when using cachyos
(
inputs.lib.mkIf (builtins.elem kernel.variant [ "cachyos" "cachyos-lto" "cachyos-server" ])
inputs.lib.mkIf (builtins.elem kernel.variant [ "cachyos" "cachyos-lts" ])
{ services.scx = { enable = true; scheduler = "scx_lavd"; extraArgs = [ "--autopower" ]; }; }
)
];