Migrate dilion to ZFS

diff --git a/modules/private/system.nix b/modules/private/system.nix
index 8c7a6f39da90c15353182d0f3e515a2e9ce6dbbd..b667ee8282254aced5cc6faac0484d8525359797 100644 (file)
--- a/modules/private/system.nix
+++ b/modules/private/system.nix
@@ -61,6 +61,9 @@
 
             pkgs.cnagios
             nagios-cli
+
+            pkgs.pv
+            pkgs.smartmontools
           ];
       };
 

diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix
index ca9a0521d7b0602d48518a4a5c13b8468b705b9c..14155efc50ee22119f9e736c72869263057c7a38 100644 (file)
--- a/modules/private/system/dilion.nix
+++ b/modules/private/system/dilion.nix
@@ -5,6 +5,19 @@
   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/fd1c511e-2bc0-49d5-b8bb-95e7e8c8c816"; };
+    "/etc"        = { fsType = "zfs"; device = "zpool/root/etc"; };
+    "/home"       = { fsType = "zfs"; device = "zpool/root/home"; };
+    "/home/immae" = { fsType = "zfs"; device = "zpool/root/home/immae"; };
+    "/tmp"        = { fsType = "zfs"; device = "zpool/root/tmp"; };
+    "/var"        = { fsType = "zfs"; device = "zpool/root/var"; };
+  };
+  boot.initrd.secrets = {
+    "/boot/pass.key" = "/boot/pass.key";
+  };
+
   networking = {
     hostId = "27c3048d"; # generated with head -c4 /dev/urandom | od -A none -t x4
     firewall.enable = false;
@@ -82,6 +95,7 @@
     install -m 0755 -o root -g root -d /var/lib/caldance
   '';
   virtualisation.docker.enable = true;
+  virtualisation.docker.storageDriver = "zfs";
   virtualisation.libvirtd.enable = true;
   users.extraUsers.immae.extraGroups = [ "libvirtd" "docker" ];
   systemd.services.libvirtd.postStart = ''

diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix
index 3fa78a4204dec338da182c7ec30dffb77e91342e..8a5d11cd53da40215e66b80714205177d29482e0 100644 (file)
--- a/modules/private/system/eldiron.nix
+++ b/modules/private/system/eldiron.nix
@@ -119,7 +119,7 @@
     fsType = "fuse";
     options = [ "force-user=pub" "create-for-user=wwwrun" "create-for-group=wwwrun" ];
   };
-  environment.systemPackages = [ pkgs.bindfs pkgs.pv pkgs.smartmontools ];
+  environment.systemPackages = [ pkgs.bindfs ];
 
   # This value determines the NixOS release with which your system is
   # to be compatible, in order to avoid breaking some software such as