Remove kerneol for master 7.2 and blacklist nouveau @ginaz

3 files changed, 13 insertions, 12 deletions

diff --git a/flake.nix b/flake.nix
index 5fdf115..024652e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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/ac63aaa40bea925946d719a839684f5e84ce6661";
+    #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 9c03ff2..585d7b5 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -1,7 +1,8 @@
 { config, inputs, outputs, pkgs, ... }: {
   boot = {
+    blacklistedKernelModules = [ "nouveau" ];
     initrd.kernelModules = [ "amdgpu" "zfs" ];
-    kernelPackages = pkgs.kerneol.linuxPackages_7_1;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -13,7 +14,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -65,7 +66,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 25e4c7e..ea0eb82 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'