diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/ginaz/default.nix | 6 | ||||
| -rw-r--r-- | overlays/default.nix | 14 |
3 files changed, 12 insertions, 12 deletions
@@ -31,7 +31,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # specific nixpkgs commit for EOL kernel and ZFS - #nixpkgs-kerneol.url ="github:NixOS/nixpkgs/ae05d822afa333fd35d417b399beb1da0ebb689d"; + nixpkgs-kerneol.url ="github:NixOS/nixpkgs/ac63aaa40bea925946d719a839684f5e84ce6661"; # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages #my-nixpkgs.url = "github:nipsy/nixpkgs/update_reaper_7.61"; @@ -57,7 +57,7 @@ home-manager, #my-nixpkgs, nixos-hardware, - #nixpkgs-kerneol, + nixpkgs-kerneol, nixpkgs-master, #nixpkgs-pr545346, nixpkgs-stable, diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix index 50d9008..9c03ff2 100644 --- a/hosts/ginaz/default.nix +++ b/hosts/ginaz/default.nix @@ -1,7 +1,7 @@ { config, inputs, outputs, pkgs, ... }: { boot = { initrd.kernelModules = [ "amdgpu" "zfs" ]; - kernelPackages = pkgs.master.linuxPackages_7_2; + kernelPackages = pkgs.kerneol.linuxPackages_7_1; loader = { efi.canTouchEfiVariables = true; systemd-boot = { @@ -13,7 +13,7 @@ supportedFilesystems = [ "zfs" ]; zfs = { forceImportRoot = false; - package = pkgs.master.zfs_2_4; + package = pkgs.kerneol.zfs_2_4; }; }; @@ -65,7 +65,7 @@ overlays = [ #inputs.nvidia-patch.overlays.default outputs.overlays.additions - #outputs.overlays.kerneol-packages + outputs.overlays.kerneol-packages outputs.overlays.master-packages outputs.overlays.modifications outputs.overlays.stable-packages diff --git a/overlays/default.nix b/overlays/default.nix index ea0eb82..25e4c7e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -75,13 +75,13 @@ # 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); - # config.allowUnfree = true; - # localSystem = final.stdenv.hostPlatform; - # }; - #}; + kerneol-packages = final: _prev: { + kerneol = import inputs.nixpkgs-kerneol { + inherit (final); + config.allowUnfree = true; + localSystem = final.stdenv.hostPlatform; + }; + }; # When applied, the master nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.master' |