diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 5 | ||||
| -rw-r--r-- | overlays/default.nix | 22 |
3 files changed, 23 insertions, 8 deletions
@@ -30,6 +30,9 @@ #nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-nixos"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # specific nixpkgs commit for EOL kernel and ZFS + nixpkgs-kerneol.url ="github:NixOS/nixpkgs/ae05d822afa333fd35d417b399beb1da0ebb689d"; + # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages #my-nixpkgs.url = "github:nipsy/nixpkgs/update_reaper_7.61"; #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; @@ -54,6 +57,7 @@ home-manager, #my-nixpkgs, nixos-hardware, + nixpkgs-kerneol, nixpkgs-master, #nixpkgs-pr495610, nixpkgs-stable, diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index 2935528..1b7ad53 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -6,7 +6,7 @@ "kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/ #"net.ipv4.tcp_congestion_control" = "reno"; }; - kernelPackages = pkgs.linuxPackages_7_0; + kernelPackages = pkgs.kerneol.linuxPackages_7_0; #kernelParams = [ # "amdgpu.ppfeaturemask=0xfffd3fff" # "split_lock_detect=off" @@ -28,7 +28,7 @@ supportedFilesystems = [ "zfs" ]; zfs = { forceImportRoot = false; - package = pkgs.zfs_2_4; + package = pkgs.kerneol.zfs_2_4; requestEncryptionCredentials = false; }; }; @@ -146,6 +146,7 @@ #inputs.nvidia-patch.overlays.default outputs.overlays.additions outputs.overlays.modifications + outputs.overlays.kerneol-packages outputs.overlays.master-packages #outputs.overlays.my-nixpkgs-packages #outputs.overlays.pr495610-packages diff --git a/overlays/default.nix b/overlays/default.nix index ad075f5..3c420f1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -5,6 +5,7 @@ # outputs.overlays.additions # outputs.overlays.modifications # outputs.overlays."67e692392-packages" +# outputs.overlays.kerneol-packages # outputs.overlays.master-packages # outputs.overlays.my-nixpkgs # outputs.overlays.pr495610-packages @@ -69,12 +70,14 @@ # }; #}; - #"wine9_22-packages" = final: _prev: { - # "wine9_22" = import inputs.nixpkgs-wine9_22 { - # inherit (final) system; - # config.allowUnfree = true; - # }; - #}; + # When applied, the kerneol nixpkgs set (declared in the flake inputs) will + # be accessible through 'pkgs.kerneol' + kerneol-packages = final: _prev: { + kerneol = import inputs.nixpkgs-kerneol { + inherit (final) system; + config.allowUnfree = true; + }; + }; # When applied, the master nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.master' @@ -116,4 +119,11 @@ # config.allowUnfree = true; # }; #}; + + #"wine9_22-packages" = final: _prev: { + # "wine9_22" = import inputs.nixpkgs-wine9_22 { + # inherit (final) system; + # config.allowUnfree = true; + # }; + #}; } |