more breaking changes for the god of breaking changes...

4 files changed, 13 insertions, 5 deletions

diff --git a/hosts/minime/zfs.nix b/hosts/minime/zfs.nix
index b13098b..826363c 100644
--- a/hosts/minime/zfs.nix
+++ b/hosts/minime/zfs.nix
@@ -15,6 +15,7 @@
   };
   networking.hostId = "41ba28ff";
   boot = {
+    zfs.forceImportRoot = false;
     plymouth.enable = false;
     tmp.useTmpfs = true;
   };
@@ -31,10 +32,17 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXrwZsBChUhVuF5gFEfj8GwQlnrqEttAytS5jVCfuE4 0xa@frituurpan"
       ];
     };
-    postCommands = ''
-      zpool import -a
-      echo "zfs load-key -a; killall zfs" >> /root/.profile
+  };
+
+  boot.initrd.systemd.services.zfs-setup-root-profile = {
+    wantedBy = [ "initrd.target" ];
+    before = [ "initrd-root-fs.target" ];
+    unitConfig.DefaultDependencies = false;
+    script = ''
+      mkdir -p /var/empty
+      echo "systemd-tty-ask-password-agent --watch" > /var/empty/.profile
     '';
+    serviceConfig.Type = "oneshot";
   };
   # support for network
   boot.initrd.kernelModules = [
@@ -47,4 +55,5 @@
     "i40e"
     "mt7921e"
   ];
+
 }
diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix
index ee20085..1c9c412 100644
--- a/hosts/toaster/default.nix
+++ b/hosts/toaster/default.nix
@@ -73,7 +73,6 @@
     home = "/home/0xa";
     isNormalUser = true;
     uid = 1000;
-    shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXrwZsBChUhVuF5gFEfj8GwQlnrqEttAytS5jVCfuE4 0xa@frituurpan"
     ];
diff --git a/hosts/toaster/zfs.nix b/hosts/toaster/zfs.nix
index 03f0ed7..d41db2e 100644
--- a/hosts/toaster/zfs.nix
+++ b/hosts/toaster/zfs.nix
@@ -14,6 +14,7 @@
   };
   networking.hostId = "dca22577";
   boot = {
+    zfs.forceImportRoot = false;
     plymouth.enable = false;
     tmp.useTmpfs = false;
     tmp.cleanOnBoot = true;
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 8eb45ea..ba3b253 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -46,7 +46,6 @@
     desktopManager.gnome.enable = true;
     displayManager.gdm = {
       enable = true;
-      wayland = true;
     };
   };