Revert all hosts to unstable

10 files changed, 20 insertions, 21 deletions

diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index ab40fd3..7eb9f28 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -6,7 +6,7 @@
       "net.ipv4.ip_forward" = 1;
       #"net.ipv4.conf.all.proxy_arp" = 1;
     };
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -21,7 +21,7 @@
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.package = pkgs.master.zfs;
+    zfs.package = pkgs.zfs;
   };
 
   environment.etc."nftables-vpn.conf".text = ''
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index deb7bd3..a1e5b18 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.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -20,7 +20,7 @@
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.package = pkgs.master.zfs;
+    zfs.package = pkgs.zfs;
   };
 
   environment.systemPackages = [
diff --git a/hosts/fangorn/default.nix b/hosts/fangorn/default.nix
index 2161f9a..962c64f 100644
--- a/hosts/fangorn/default.nix
+++ b/hosts/fangorn/default.nix
@@ -1,6 +1,6 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
@@ -9,7 +9,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      package = pkgs.zfs;
     };
   };
 
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index bf97009..a58a10a 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -1,19 +1,18 @@
 { config, inputs, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "amdgpu" "zfs" ];
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.package = pkgs.master.zfs;
+    zfs.package = pkgs.zfs;
   };
 
   environment.systemPackages = [
     pkgs.signal-desktop
-    #pkgs.master.wsmancli
   ];
 
   imports = [
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index ea8351e..4c8e83e 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
@@ -13,7 +13,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      package = pkgs.zfs;
     };
   };
 
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index ecf284b..4ab99d5 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.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
@@ -10,7 +10,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      package = pkgs.zfs;
     };
   };
 
diff --git a/hosts/neptune/default.nix b/hosts/neptune/default.nix
index 49bc30d..4e7f30c 100644
--- a/hosts/neptune/default.nix
+++ b/hosts/neptune/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
@@ -13,7 +13,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      package = pkgs.zfs;
     };
   };
 
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index b686402..08fe724 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,12 +1,12 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader.grub.enable = true;
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      package = pkgs.zfs;
     };
   };
 
diff --git a/hosts/saturn/default.nix b/hosts/saturn/default.nix
index 80eedc8..b3f241b 100644
--- a/hosts/saturn/default.nix
+++ b/hosts/saturn/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
@@ -13,7 +13,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      package = pkgs.zfs;
     };
   };
 
diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix
index ec0f340..aef0fc1 100644
--- a/hosts/uranus/default.nix
+++ b/hosts/uranus/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_6_15;
+    kernelPackages = pkgs.linuxPackages_6_15;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
@@ -13,7 +13,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       devNodes = "/dev/disk/by-label";
-      package = pkgs.master.zfs;
+      package = pkgs.zfs;
     };
   };