chore: cleanup config and bring settings over from earlier

modules/image/disk/default.nix

@@ -20,9 +20,6 @@
     ${pkgs.coreutils}/bin/sha256sum * > SHA256SUMS
   '';
 
-  boot.initrd.systemd.enable = true;
-
-  boot.initrd.systemd.repart.enable = true;
   systemd.repart.partitions = {
     "10-esp" = {
       Type = "esp";
@@ -62,28 +59,40 @@
     };
   };
 
-  boot.initrd.compressor = "zstd";
-  boot.initrd.compressorArgs = [ "-8" ];
-
   boot.loader.grub.enable = false;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.systemd-boot.enable = true;
+  boot.uki.name = "patos";
 
-  boot.initrd.luks.forceLuksSupportInInitrd = true;
-  boot.initrd.kernelModules = [
-    "dm_mod"
-    "dm_crypt"
-  ] ++ config.boot.initrd.luks.cryptoModules;
+  boot.initrd = {
+    compressor = "zstd";
+    compressorArgs = [ "-8" ];
 
-  boot.initrd.supportedFilesystems = {
-    btrfs = true;
-    erofs = true;
+    luks.forceLuksSupportInInitrd = true;
+    kernelModules = [
+      "dm_mod"
+      "dm_crypt"
+    ] ++ config.boot.initrd.luks.cryptoModules;
+
+    supportedFilesystems = {
+      btrfs = true;
+      erofs = true;
+    };
+
+    systemd.enable = true;
+    systemd.repart.enable = true;
+    systemd.services.systemd-repart = {
+      after = lib.mkForce [ "sysroot.mount" ];
+      requires = [ "sysroot.mount" ];
+      serviceConfig.Environment = [
+        "SYSTEMD_REPART_MKFS_OPTIONS_BTRFS=--nodiscard"
+      ];
+    };
   };
 
   system.etc.overlay.mutable = false;
   users.mutableUsers = false;
 
-  boot.initrd.systemd.services.systemd-repart.after = lib.mkForce [ "sysroot.mount" ];
-  boot.initrd.systemd.services.systemd-repart.requires = [ "sysroot.mount" ];
-
   boot.kernelParams = [
     "rootfstype=erofs"
     "rootflags=ro"
@@ -115,10 +124,6 @@
     mode = "0755";
   };
 
-  boot.initrd.systemd.services.systemd-repart.serviceConfig.Environment = [
-    "SYSTEMD_REPART_MKFS_OPTIONS_BTRFS=--nodiscard"
-  ];
-
   # Refuse to boot on mount failure
   systemd.targets."sysinit".requires = [ "local-fs.target" ];
 

modules/image/disk/updater.nix

@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
 
   options.system.image.updates = {
     enable = lib.mkEnableOption "system updates via systemd-sysupdate" // {