Migrate eldiron to zfs

diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix
index b2a728c1864fa8173c1fbe955491bc5427fa6376..3fa78a4204dec338da182c7ec30dffb77e91342e 100644 (file)
--- a/modules/private/system/eldiron.nix
+++ b/modules/private/system/eldiron.nix
@@ -1,10 +1,31 @@
 { privateFiles }:
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   boot.supportedFilesystems = [ "zfs" ];
+  boot.kernelParams = ["zfs.zfs_arc_max=6442450944"];
   boot.kernelPackages = pkgs.linuxPackages_latest;
   myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; };
 
+  fileSystems = {
+    "/"     = lib.mkForce { fsType = "zfs"; device = "zpool/root"; };
+    "/boot" = { fsType = "ext4"; device = "/dev/disk/by-uuid/e6bb18fb-ff56-4b5f-ae9f-e60d40dc0622"; };
+    "/etc"  = { fsType = "zfs"; device = "zpool/root/etc"; };
+    "/nix"  = { fsType = "zfs"; device = "zpool/root/nix"; };
+    "/tmp"  = { fsType = "zfs"; device = "zpool/root/tmp"; };
+    "/var"  = { fsType = "zfs"; device = "zpool/root/var"; };
+  };
+  boot.initrd.secrets = {
+    "/boot/pass.key" = "/boot/pass.key";
+  };
+
+  services.zfs = {
+    autoSnapshot = {
+      enable = true;
+    };
+    autoScrub = {
+      enable = true;
+    };
+  };
   networking = {
     hostId = "8262ca33"; # generated with head -c4 /dev/urandom | od -A none -t x4
     firewall.enable = true;
@@ -98,7 +119,7 @@
     fsType = "fuse";
     options = [ "force-user=pub" "create-for-user=wwwrun" "create-for-group=wwwrun" ];
   };
-  environment.systemPackages = [ pkgs.bindfs ];
+  environment.systemPackages = [ pkgs.bindfs pkgs.pv pkgs.smartmontools ];
 
   # This value determines the NixOS release with which your system is
   # to be compatible, in order to avoid breaking some software such as