From 41595db981b5a67cb1017a2ce89ea0ea11aa13a6 Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Wed, 18 Dec 2024 08:31:25 -0800 Subject: Revert to unstable now that 6.12.5 has landed --- hosts/arrakis/default.nix | 4 ++-- hosts/darkstar/default.nix | 4 ++-- hosts/ginaz/default.nix | 4 ++-- hosts/jupiter/default.nix | 4 ++-- hosts/kaitain/default.nix | 4 ++-- hosts/neptune/default.nix | 4 ++-- hosts/richese/default.nix | 4 ++-- hosts/saturn/default.nix | 4 ++-- hosts/uranus/default.nix | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 83af04f..e4957d6 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -5,7 +5,7 @@ "net.ipv4.ip_forward" = 1; "net.ipv4.conf.all.proxy_arp" = 1; }; - kernelPackages = pkgs.master.linuxPackages_6_12; + kernelPackages = pkgs.linuxPackages_6_12; loader = { efi = { canTouchEfiVariables = true; @@ -20,7 +20,7 @@ timeout = 3; }; supportedFilesystems = [ "zfs" ]; - zfs.package = pkgs.master.zfs; + #zfs.package = pkgs.master.zfs; }; environment.etc."nftables-vpn.conf".text = '' diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix index 494db0b..b53a7d7 100644 --- a/hosts/darkstar/default.nix +++ b/hosts/darkstar/default.nix @@ -4,7 +4,7 @@ kernel.sysctl = { "net.ipv4.ip_forward" = true; }; - kernelPackages = pkgs.master.linuxPackages_6_12; + kernelPackages = pkgs.linuxPackages_6_12; loader = { efi = { canTouchEfiVariables = true; @@ -19,7 +19,7 @@ timeout = 3; }; supportedFilesystems = [ "zfs" ]; - zfs.package = pkgs.master.zfs; + #zfs.package = pkgs.master.zfs; }; #environment.systemPackages = with pkgs; [ diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix index 05f477c..8781ea8 100644 --- a/hosts/ginaz/default.nix +++ b/hosts/ginaz/default.nix @@ -1,14 +1,14 @@ { config, inputs, outputs, pkgs, ... }: { boot = { initrd.kernelModules = [ "amdgpu" "zfs" ]; - kernelPackages = pkgs.master.linuxPackages_6_12; + kernelPackages = pkgs.linuxPackages_6_12; loader = { efi.canTouchEfiVariables = true; systemd-boot.enable = true; timeout = 3; }; supportedFilesystems = [ "zfs" ]; - zfs.package = pkgs.master.zfs; + #zfs.package = pkgs.master.zfs; }; environment.systemPackages = with pkgs; [ diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix index fb39743..c6ad5ff 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_12; + kernelPackages = pkgs.linuxPackages_6_12; 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.master.zfs; }; }; diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix index 573777a..9a222be 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_12; + kernelPackages = pkgs.linuxPackages_6_12; 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.master.zfs; }; }; diff --git a/hosts/neptune/default.nix b/hosts/neptune/default.nix index 8be9a8c..f19e4f1 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_12; + kernelPackages = pkgs.linuxPackages_6_12; 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.master.zfs; }; }; diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix index 15f58b3..2a97fc4 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_12; + kernelPackages = pkgs.linuxPackages_6_12; loader.grub.enable = true; supportedFilesystems = [ "zfs" ]; zfs = { devNodes = "/dev/disk/by-label"; - package = pkgs.master.zfs; + #package = pkgs.master.zfs; }; }; diff --git a/hosts/saturn/default.nix b/hosts/saturn/default.nix index ff51ac2..9930e7e 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_12; + kernelPackages = pkgs.linuxPackages_6_12; 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.master.zfs; }; }; diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix index b7b3f35..68be405 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_12; + kernelPackages = pkgs.linuxPackages_6_12; 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.master.zfs; }; }; -- cgit v1.2.3