aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-12-12 09:06:06 -0800
committerMark Nipper <nipsy@bitgnome.net>2024-12-12 09:06:06 -0800
commit482fbb9834ecf9621b1370664d56a01802cd8034 (patch)
treeb5a0259c4b539048d62a96bc0e9b2bf449658c49
parent05138d351d3fe86f7bb710846543d4ae2cbc1104 (diff)
downloadnix-482fbb9834ecf9621b1370664d56a01802cd8034.tar
nix-482fbb9834ecf9621b1370664d56a01802cd8034.tar.gz
nix-482fbb9834ecf9621b1370664d56a01802cd8034.tar.bz2
nix-482fbb9834ecf9621b1370664d56a01802cd8034.tar.lz
nix-482fbb9834ecf9621b1370664d56a01802cd8034.tar.xz
nix-482fbb9834ecf9621b1370664d56a01802cd8034.tar.zst
nix-482fbb9834ecf9621b1370664d56a01802cd8034.zip
Switch to ZFS 2.2.7 @{kaitain,richese}
-rw-r--r--hosts/kaitain/default.nix7
-rw-r--r--hosts/richese/default.nix7
2 files changed, 10 insertions, 4 deletions
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index 72aadff..573777a 100644
--- a/hosts/kaitain/default.nix
+++ b/hosts/kaitain/default.nix
@@ -1,14 +1,17 @@
{ config, inputs, lib, outputs, pkgs, ... }: {
boot = {
initrd.kernelModules = [ "zfs" ];
- #kernelPackages = pkgs.linuxPackages_6_10;
+ kernelPackages = pkgs.master.linuxPackages_6_12;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
timeout = 3;
};
supportedFilesystems = [ "zfs" ];
- zfs.devNodes = "/dev/disk/by-label";
+ zfs = {
+ devNodes = "/dev/disk/by-label";
+ package = pkgs.master.zfs;
+ };
};
environment.systemPackages = with pkgs; [
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index d612b07..15f58b3 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,10 +1,13 @@
{ config, inputs, lib, outputs, pkgs, ... }: {
boot = {
initrd.kernelModules = [ "zfs" ];
- #kernelPackages = pkgs.linuxPackages_6_10;
+ kernelPackages = pkgs.master.linuxPackages_6_12;
loader.grub.enable = true;
supportedFilesystems = [ "zfs" ];
- zfs.devNodes = "/dev/disk/by-label";
+ zfs = {
+ devNodes = "/dev/disk/by-label";
+ package = pkgs.master.zfs;
+ };
};
environment.systemPackages = with pkgs; [