Bump kernel to 7.0 and ZFS master branch versions @*

10 files changed, 20 insertions, 20 deletions

diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index f9e6ac8..66df1af 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.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -25,7 +25,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index 23ec0df..08d6e78 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.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -23,7 +23,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/fangorn/default.nix b/hosts/fangorn/default.nix
index 0ae189d..cdf30af 100644
--- a/hosts/fangorn/default.nix
+++ b/hosts/fangorn/default.nix
@@ -1,6 +1,6 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -13,7 +13,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index 0edbdba..df4c558 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.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -13,7 +13,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 6d799b9..6c73e8a 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index bbc35d4..3fba8dc 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.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -14,7 +14,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/neptune/default.nix b/hosts/neptune/default.nix
index 41ad33d..8c52d18 100644
--- a/hosts/neptune/default.nix
+++ b/hosts/neptune/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 222f36b..3fdef04 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.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -14,7 +14,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/saturn/default.nix b/hosts/saturn/default.nix
index ba851cf..9cad0ae 100644
--- a/hosts/saturn/default.nix
+++ b/hosts/saturn/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix
index d1c591e..52db18f 100644
--- a/hosts/uranus/default.nix
+++ b/hosts/uranus/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.linuxPackages_6_18;
+    kernelPackages = pkgs.master.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };