diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/minime/zfs.nix | 4 | ||||
| -rw-r--r-- | hosts/toaster/zfs.nix | 4 | ||||
| -rw-r--r-- | modules/zfs-common.nix | 10 |
4 files changed, 12 insertions, 8 deletions
@@ -117,6 +117,7 @@ ./modules/virtualization.nix ./modules/wg ./modules/factorio.nix + ./modules/zfs-common.nix ]; }; cloud = nixpkgs.lib.nixosSystem { @@ -145,6 +146,7 @@ ./modules/server ./modules/binary-caches.nix ./modules/wg + ./modules/zfs-common.nix { config.microvm.autostart = microvm-stable-list ++ microvm-unstable-list; diff --git a/hosts/minime/zfs.nix b/hosts/minime/zfs.nix index bcc27bb..5c779c6 100644 --- a/hosts/minime/zfs.nix +++ b/hosts/minime/zfs.nix @@ -16,10 +16,6 @@ }; networking.hostId = "41ba28ff"; boot = { - kernelPackages = pkgs.linuxKernel.packages.linux_6_12; - zfs.package = pkgs.zfs_2_3; - supportedFilesystems = [ "zfs" ]; - kernelParams = [ "nohibernate" ]; plymouth.enable = false; tmp.useTmpfs = true; }; diff --git a/hosts/toaster/zfs.nix b/hosts/toaster/zfs.nix index 1970bbf..03f0ed7 100644 --- a/hosts/toaster/zfs.nix +++ b/hosts/toaster/zfs.nix @@ -14,10 +14,6 @@ }; networking.hostId = "dca22577"; boot = { - kernelPackages = pkgs.linuxKernel.packages.linux_6_12; - zfs.package = pkgs.zfs_2_3; - supportedFilesystems = [ "zfs" ]; - kernelParams = [ "nohibernate" ]; plymouth.enable = false; tmp.useTmpfs = false; tmp.cleanOnBoot = true; diff --git a/modules/zfs-common.nix b/modules/zfs-common.nix new file mode 100644 index 0000000..822c106 --- /dev/null +++ b/modules/zfs-common.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + boot = { + kernelPackages = pkgs.linuxKernel.packages.linux_6_18; + zfs.package = pkgs.zfs_2_4; + supportedFilesystems = [ "zfs" ]; + kernelParams = [ "nohibernate" ]; + }; +} |