0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update to zfs 2.3

Browse source
This commit is contained in:
Grisha Shipunov 2025-01-21 17:15:17 +01:00
parent e2111aa6ec
commit c7f40d8ebb
3 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
hosts/minime/zfs.nix
View file

@ -18,21 +18,8 @@
}; };
networking.hostId = "41ba28ff"; networking.hostId = "41ba28ff";
boot = { boot = {
kernelPackages = kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
let zfs.package = pkgs.zfs_2_3;
zfsCompatibleKernelPackages = lib.filterAttrs (
name: kernelPackages:
(builtins.match "linux_[0-9]+_[0-9]+" name) != null
&& (builtins.tryEval kernelPackages).success
&& (!kernelPackages.${config.boot.zfs.package.kernelModuleAttribute}.meta.broken)
) pkgs.linuxKernel.packages;
latestKernelPackage = lib.last (
lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (
builtins.attrValues zfsCompatibleKernelPackages
)
);
in
latestKernelPackage;
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
kernelParams = [ "nohibernate" ]; kernelParams = [ "nohibernate" ];
plymouth.enable = false; plymouth.enable = false;

2
hosts/toaster/amd.nix
View file

@ -5,6 +5,8 @@
boot.kernelParams = [ boot.kernelParams = [
# use new amd pstate driver # use new amd pstate driver
"amd_pstate=active" "amd_pstate=active"
# fix flicker
"amdgpu.dcdebugmask=0x10"
]; ];
# hardware.graphics = { # hardware.graphics = {

17
hosts/toaster/zfs.nix
View file

@ -16,21 +16,8 @@
}; };
networking.hostId = "dca22577"; networking.hostId = "dca22577";
boot = { boot = {
kernelPackages = kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
let zfs.package = pkgs.zfs_2_3;
zfsCompatibleKernelPackages = lib.filterAttrs (
name: kernelPackages:
(builtins.match "linux_[0-9]+_[0-9]+" name) != null
&& (builtins.tryEval kernelPackages).success
&& (!kernelPackages.${config.boot.zfs.package.kernelModuleAttribute}.meta.broken)
) pkgs.linuxKernel.packages;
latestKernelPackage = lib.last (
lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (
builtins.attrValues zfsCompatibleKernelPackages
)
);
in
latestKernelPackage;
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
kernelParams = [ "nohibernate" ]; kernelParams = [ "nohibernate" ];
plymouth.enable = false; plymouth.enable = false;