Update hypnos config

hosts/hypnos/default.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ./disko-config.nix
     ../desktop.nix
   ];
 
@@ -14,7 +15,6 @@
   networking = {
     hostName = "hypnos";
     hostId = "cf791898";
-    networkmanager.enable = true;
   };
 
   nix = {

hosts/hypnos/disko-config.nix

@@ -1,3 +1,4 @@
+{ lib, ... }:
 {
   disko.devices = {
     disk = {
@@ -39,15 +40,16 @@
           dnodesize = "auto";
           xattr = "sa";
         };
-        mountpoint = "/";
         postCreateHook = "zfs snapshot rpool@blank";
         datasets = {
           local = {
+            type = "zfs_fs";
             options = {
               mountpoint = "none";
             };
           };
           "local/nix" = {
+            type = "zfs_fs";
             mountpoint = "/nix";
             options = {
               atime = "off";
@@ -55,6 +57,7 @@
             };
           };
           "local/tmp" = {
+            type = "zfs_fs";
             mountpoint = "/tmp";
             options = {
               setuid = "off";
@@ -63,24 +66,21 @@
             };
           };
           system = {
+            type = "zfs_fs";
+            mountpoint = "/";
             options = {
-              mountpoint = "none";
-              encryption = "aes-256-gcm";
-              keyformat = "passphrase";
-              keylocation = "file:///tmp/secret.key";
+              mountpoint = "legacy";
             };
-            # use this to read the key during boot
-            postCreateHook = ''
-              zfs set keylocation="prompt" "rpool/$name";
-            '';
           };
           "system/var" = {
+            type = "zfs_fs";
             mountpoint = "/var";
             options = {
               mountpoint = "legacy";
             };
           };
           "system/var/tmp" = {
+            type = "zfs_fs";
             mountpoint = "/var/tmp";
             options = {
               devices = "off";
@@ -88,6 +88,7 @@
             };
           };
           "system/var/log" = {
+            type = "zfs_fs";
             mountpoint = "/var/log";
             options = {
               compression = "on";
@@ -96,6 +97,7 @@
             };
           };
           user = {
+            type = "zfs_fs";
             options = {
               mountpoint = "none";
               encryption = "aes-256-gcm";
@@ -108,6 +110,7 @@
             '';
           };
           "user/home" = {
+            type = "zfs_fs";
             mountpoint = "/home";
             options = {
               setuid = "off";

hosts/hypnos/hardware-configuration.nix

@@ -6,7 +6,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "achi" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
     initrd.kernelModules = [ ];
     kernelModules = [ "kvm-intel" "wl" ];
     extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];