Restructure flake.nix for a simpler config for building different images off the same NixOS config.

nix/configuration/roles/sway/default.nix

@@ -313,7 +313,7 @@ in
 
     # Probably would be cleaner to use environment.sessionVariables but programs.sway.extraSessionCommands is sway-specific.
     programs.sway.extraSessionCommands =
-      if config.me.buildingIso then
+      if config.me.buildingPortable then
         ''
           export WLR_RENDERER_ALLOW_SOFTWARE=1
           export NIXOS_OZONE_WL=1 # Wayland support for chromium and electron
@@ -330,7 +330,7 @@ in
       enable = true;
       wrapperFeatures.gtk = true;
       extraOptions =
-        if config.me.buildingIso then
+        if config.me.buildingPortable then
           [
             "--config"
             "${sway-config}"
@@ -343,7 +343,7 @@ in
           ];
     };
 
-    environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+    environment.persistence."/state" = lib.mkIf (config.me.mountPersistence) {
       hideMounts = true;
       users.talexander = {
         files = [