hosts/phoenix.lewd.wtf/services/zfs.nix

@@ -6,21 +6,23 @@ let
 in
 {
   # ZFS remote unlocking
+  boot.initrd.systemd.enable = true;
   boot.initrd.availableKernelModules = [ "igb" ];
   boot.kernelParams = [
     "ip=192.168.0.42::192.168.0.1:255.255.252.0:phoenix-initrd:eno2:off:192.168.0.1"
   ];
-  boot.initrd.systemd.services.zfsunlock = {
+  boot.initrd.network = {
-    description = "Unlock ZFS pools";
+    enable = true;
-    wantedBy = [
+    ssh = {
-      "initrd.target"
+       enable = true;
-    ];
+       port = 2222;
-    before = [
+       hostKeys = [
-      "zfs-import-zroot.service"
+         /boot-1/initrd-ssh-key
-    ];
+         /boot-2/initrd-ssh-key
-    unitConfig.DefaultDependencies = "no";
+       ];
-    serviceConfig.Type = "oneshot";
+       authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
-    script = ''
+    };
+    postCommands = ''
       cat <<EOF > /root/.profile
       if pgrep -x "zfs" > /dev/null
       then
@@ -36,18 +38,6 @@ in
       EOF
     '';
   };
-  boot.initrd.network = {
-    enable = true;
-    ssh = {
-       enable = true;
-       port = 2222;
-       hostKeys = [
-         /boot-1/initrd-ssh-key
-         /boot-2/initrd-ssh-key
-       ];
-       authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
-    };
-  };
 
   # ZFS options from https://nixos.wiki/wiki/NixOS_on_ZFS
   networking.hostId = "42069420";

modules/base/packages.nix

@@ -4,8 +4,7 @@
     vim
     git
     curl
-    btop
+    htop
     rclone
-    screen
   ];
 }