refactor(guest): assemble guest modules

guests/actualbudget.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  flake,
   ...
 }:
 let
@@ -9,18 +8,6 @@ let
   dataDir = "/data";
 in
 {
-  imports = [
-    (flake.mkGuest {
-      name = "actualbudget";
-      interior = {
-        modules.services.actualbudget = {
-          enable = true;
-          inherit dataDir;
-        };
-      };
-    })
-  ];
-
   options.guests.actualbudget = {
     dataPath = lib.mkOption {
       type = lib.types.nullOr lib.types.str;
@@ -39,6 +26,12 @@ in
     ];
 
     guests.actualbudget = {
+      interior = {
+        modules.services.actualbudget = {
+          enable = true;
+          inherit dataDir;
+        };
+      };
       mounts.${dataDir}.directory = cfg.dataPath;
       limits = {
         memory = lib.mkDefault "2G";

guests/copyparty.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  flake,
   ...
 }:
 let
@@ -34,26 +33,6 @@ let
   };
 in
 {
-  imports = [
-    (flake.mkGuest {
-      name = "copyparty";
-      interior = {
-        modules.services.copyparty = {
-          enable = true;
-          inherit (cfg) accountName stateDir;
-          passwordFile = "/run/secrets/${cfg.passwordSecret}";
-          reverseProxy = {
-            enable = cfg.reverseProxy.enable;
-            inherit (cfg.reverseProxy) trustedSources;
-          };
-          volumes = lib.mapAttrs (_urlPath: volume: {
-            inherit (volume) path access flags;
-          }) cfg.volumes;
-        };
-      };
-    })
-  ];
-
   options.guests.copyparty = {
     accountName = lib.mkOption {
       type = lib.types.str;
@@ -106,6 +85,19 @@ in
     ];
 
     guests.copyparty = {
+      interior.modules.services.copyparty = {
+        enable = true;
+        inherit (cfg) accountName stateDir;
+        passwordFile = "/run/secrets/${cfg.passwordSecret}";
+        reverseProxy = {
+          enable = cfg.reverseProxy.enable;
+          inherit (cfg.reverseProxy) trustedSources;
+        };
+        volumes = lib.mapAttrs (_urlPath: volume: {
+          inherit (volume) path access flags;
+        }) cfg.volumes;
+      };
+
       mounts =
         {
           ${cfg.stateDir} = {

guests/reverse-proxy.nix

@@ -1,16 +1,14 @@
 {
   config,
   lib,
-  flake,
   ...
 }:
 let
   giteaSshBackend = "10.23.20.45:2022";
 in
 {
-  imports = [
-    (flake.mkGuest {
-      name = "reverse-proxy";
+  config = lib.mkIf config.guests.reverse-proxy.enable {
+    guests.reverse-proxy = {
       interior = {
         modules.services.reverse-proxy.enable = true;
 
@@ -66,11 +64,7 @@ in
           }
         '';
       };
-    })
-  ];
 
-  config = lib.mkIf config.guests.reverse-proxy.enable {
-    guests.reverse-proxy = {
       limits = {
         memory = lib.mkDefault "1G";
         cpu = lib.mkDefault "100%";