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

nix/configuration/roles/2ship2harkinian/default.nix

@@ -17,32 +17,27 @@
     };
   };
 
-  config = lib.mkIf config.me.ship2harkinian.enable (
-    lib.mkMerge [
-      {
-        allowedUnfree = [ "2ship2harkinian" ];
-      }
-      (lib.mkIf config.me.graphical {
-        environment.systemPackages = with pkgs; [
-          _2ship2harkinian
+  config = lib.mkIf (config.me.ship2harkinian.enable && config.me.graphical) {
+    allowedUnfree = [ "2ship2harkinian" ];
+
+    environment.systemPackages = with pkgs; [
+      _2ship2harkinian
+    ];
+
+    # TODO perhaps install ~/.local/share/2ship/2ship2harkinian.json
+
+    environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
+      hideMounts = true;
+      users.talexander = {
+        directories = [
+          {
+            directory = ".local/share/2ship";
+            user = "talexander";
+            group = "talexander";
+            mode = "0755";
+          }
         ];
-
-        # TODO perhaps install ~/.local/share/2ship/2ship2harkinian.json
-
-        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          users.talexander = {
-            directories = [
-              {
-                directory = ".local/share/2ship";
-                user = "talexander";
-                group = "talexander";
-                mode = "0755";
-              }
-            ];
-          };
-        };
-      })
-    ]
-  );
+      };
+    };
+  };
 }