3 files changed, 4 insertions, 14 deletions

diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index da8b82f7..8554d112 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -1,7 +1,8 @@
 { flake, pkgs, lib, ... }:
 {
   imports = with flake.nixosModules.systemProfiles; [
-    qemu-guest openssh rebuild-machines ./zfs.nix ./dns ./tls.nix
+    qemu-guest openssh rebuild-machines zfs
+    ./zfs.nix ./dns ./tls.nix
   ];
 
   config = {
@@ -19,15 +20,10 @@
         device = "/dev/vda";
       };
 
-      kernelPackages = pkgs.linuxPackages_latest;
 
       tmpOnTmpfs = true;
 
-      supportedFilesystems = [ "zfs" ];
-      zfs = {
-        enableUnstable = true;
-        devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
-      };
+      zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
 
       kernelModules = ["ptp_kvm"];
     };
diff --git a/hosts/surtr/tls.nix b/hosts/surtr/tls.nix
index e05cbdd9..6a1d6f84 100644
--- a/hosts/surtr/tls.nix
+++ b/hosts/surtr/tls.nix
@@ -56,7 +56,7 @@ in {
     security.acme = {
       acceptTerms = true;
       preliminarySelfsigned = true; # DNS challenge is slow
-      email = "phikeebaogobaegh@141.li";
+      defaults.email = "phikeebaogobaegh@141.li";
       certs =
         let
           domainAttrset = domain: {
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 47afc9fe..395476bf 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -22,7 +22,6 @@
         device = "/dev/disk/by-id/ata-SuperMicro_SSD_SMC0515D95019BDF4083";
       };
 
-      kernelPackages = pkgs.linuxPackages_latest;
       kernelModules = [ "kvm-intel" ];
 
       kernelParams = [
@@ -50,11 +49,6 @@
 
         network.flushBeforeStage2 = false;
       };
-      
-      supportedFilesystems = [ "zfs" ];
-      zfs = {
-        enableUnstable = true;
-      };
     };
 
     fileSystems = {