Set up waybar and building ISOs.

nix/configuration/configuration.nix

@@ -10,6 +10,7 @@
 {
   imports = [
     ./roles/reset
+    ./roles/iso
     ./hosts/odo
     "${
       builtins.fetchTarball {
@@ -30,6 +31,8 @@
     ./roles/git
     ./roles/fonts
     ./roles/gpg
+    ./roles/waybar
+    ./roles/qemu
   ];
 
   nix.settings.experimental-features = [
@@ -134,38 +137,17 @@
     ];
   };
 
-  # Check what will be lost with `zfs diff zroot/linux/root@blank`
-  boot.initrd.systemd.enable = lib.mkDefault true;
-  boot.initrd.systemd.services.zfs-rollback = {
-    description = "Rollback ZFS root dataset to blank snapshot";
-    wantedBy = [
-      "initrd.target"
-    ];
-    after = [
-      "zfs-import-zroot.service"
-    ];
-    before = [
-      "sysroot.mount"
-    ];
-    path = with pkgs; [
-      zfs
-    ];
-    unitConfig.DefaultDependencies = "no";
-    serviceConfig.Type = "oneshot";
-    script = ''
-      zfs rollback -r zroot/linux/nix/root@blank
-      zfs rollback -r zroot/linux/nix/home@blank
-      echo "rollback complete"
-    '';
-  };
-
-  environment.persistence."/persist" = {
+  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
     hideMounts = true;
     directories = [
       "/var/lib/iwd" # Wifi settings
       "/var/lib/nixos" # Contains user information (uids/gids)
+      "/var/lib/systemd" # Systemd state directory for random seed, persistent timers, core dumps, persist hardware state like backlight and rfkill
+      "/var/log/journal" # Logs, alternatively set `services.journald.storage = "volatile";` to write to /run/log/journal
+      "/etc/zfs/zpool.cache" # Which zpools to import, the root zpool is already imported and does not need this cache file but this captures additional pools. TODO consider setting cachefile=none on main pool.
     ];
     files = [
+      "/etc/machine-id" # Systemd unique machine id "otherwise, the system journal may fail to list earlier boots, etc"
       "/etc/ssh/ssh_host_rsa_key"
       "/etc/ssh/ssh_host_rsa_key.pub"
       "/etc/ssh/ssh_host_ed25519_key"