Bump everything to latest kernel and remove kerneol input

12 files changed, 39 insertions, 39 deletions

diff --git a/flake.nix b/flake.nix
index be6cab6..308b92f 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/ae05d822afa333fd35d417b399beb1da0ebb689d";
+    #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";
@@ -57,7 +57,7 @@
     home-manager,
     #my-nixpkgs,
     nixos-hardware,
-    nixpkgs-kerneol,
+    #nixpkgs-kerneol,
     nixpkgs-master,
     #nixpkgs-pr545346,
     nixpkgs-stable,
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index cd6fe81..c558ef8 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -7,7 +7,7 @@
       "net.netfilter.nf_log_all_netns" = 1;
       #"net.ipv4.conf.all.proxy_arp" = 1;
     };
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -25,7 +25,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -235,7 +235,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.pr545346-packages
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index b14a807..de7b443 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -5,7 +5,7 @@
       "kernel.hostname" = "darkstar.bitgnome.net";
       "net.ipv4.ip_forward" = true;
     };
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -23,7 +23,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -101,7 +101,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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/hosts/fangorn/default.nix b/hosts/fangorn/default.nix
index 467f2c9..819c75b 100644
--- a/hosts/fangorn/default.nix
+++ b/hosts/fangorn/default.nix
@@ -1,6 +1,6 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -13,7 +13,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -62,7 +62,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index d9d18b9..27dca17 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.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -13,7 +13,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.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/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 569a9cd..d0afb4c 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -58,7 +58,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index 6f9ab51..28ab8d7 100644
--- a/hosts/kaitain/default.nix
+++ b/hosts/kaitain/default.nix
@@ -1,7 +1,7 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -14,7 +14,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -50,7 +50,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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/hosts/neptune/default.nix b/hosts/neptune/default.nix
index f53f633..abd9c8d 100644
--- a/hosts/neptune/default.nix
+++ b/hosts/neptune/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -58,7 +58,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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/hosts/richese/default.nix b/hosts/richese/default.nix
index a73405c..d40024f 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,7 +1,7 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -14,7 +14,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -51,7 +51,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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/hosts/saturn/default.nix b/hosts/saturn/default.nix
index 3732dc2..1503506 100644
--- a/hosts/saturn/default.nix
+++ b/hosts/saturn/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -58,7 +58,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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/hosts/uranus/default.nix b/hosts/uranus/default.nix
index 9a76f71..6c90ff1 100644
--- a/hosts/uranus/default.nix
+++ b/hosts/uranus/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+    kernelPackages = pkgs.master.linuxPackages_7_2;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.kerneol.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -58,7 +58,7 @@
     hostPlatform = "x86_64-linux";
     overlays = [
       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 f5db9e3..4c0b93e 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'