From 1f01f088d8494d3fbd2a5e380772db07c98d1409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
 <nicolas.jeannerod@moduscreate.com>
Date: Thu, 8 May 2025 17:06:20 +0200
Subject: [PATCH] mar

---
 deployment/check/basic/nixosTest.nix | 69 ++++++++++++++++------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/deployment/check/basic/nixosTest.nix b/deployment/check/basic/nixosTest.nix
index 4904368e..3d6bf9f7 100644
--- a/deployment/check/basic/nixosTest.nix
+++ b/deployment/check/basic/nixosTest.nix
@@ -11,7 +11,7 @@ testers.runNixOSTest (
   let
     sources = import ../../../npins;
     pkgs = hostPkgs;
-    dummyFile = hostPkgs.writeText "dummy" "";
+    # dummyFile = hostPkgs.writeText "dummy" "";
     tf = pkgs.callPackage ../../../launch/tf.nix { };
     tfEnv = pkgs.callPackage ../../../launch/tf-env.nix { };
     inherit (pkgs) lib;
@@ -112,36 +112,45 @@ testers.runNixOSTest (
         fake = {
           imports = [
             ../basic/minimalTarget.nix
-            ../../../services/fediversity
-          ];
-          fediversity = {
-            domain = "dummy";
-            garage.enable = true;
-            mastodon = {
-              enable = true;
-              s3AccessKeyFile = dummyFile;
-              s3SecretKeyFile = dummyFile;
-            };
-            peertube = {
-              enable = true;
-              secretsFile = dummyFile;
-              s3AccessKeyFile = dummyFile;
-              s3SecretKeyFile = dummyFile;
-            };
-            # pixelfed = {
-            #   enable = true;
-            #   s3AccessKeyFile = dummyFile;
-            #   s3SecretKeyFile = dummyFile;
-            # };
-            temp.cores = 1;
-            temp.initialUser = {
-              username = "dummy";
-              displayName = "dummy";
-              email = "dummy";
-              passwordFile = dummyFile;
-            };
-          };
 
+            ## NOTE: Cannot use ../../../launch/shared.nix because it involves
+            ## <disko/module.nix> and <agenix/modules/age.nix>.
+            (
+              { pkgs, ... }:
+              let
+                hostname = "dummy";
+                domain = "dummy";
+                initialUser = {
+                  username = "dummy";
+                  email = "dummy";
+                  displayName = "dummy";
+                };
+              in
+              {
+                imports = [
+                  # <disko/module.nix>
+                  # <agenix/modules/age.nix>
+                  ../../../services/fediversity
+                  ../../../launch/resource.nix
+                ];
+                fediversityVm.name = hostname;
+                fediversity = {
+                  inherit domain;
+                  temp.initialUser = {
+                    inherit (initialUser) username email displayName;
+                    # FIXME: disgusting, but nvm, this is going to be replaced by
+                    # proper central authentication at some point
+                    passwordFile = pkgs.writeText "password" initialUser.password;
+                  };
+                };
+              }
+            )
+
+            ../../../launch/garage.nix
+            ../../../launch/mastodon.nix
+            ../../../launch/pixelfed.nix
+            ../../../launch/peertube.nix
+          ];
         };
       }
       // lib.genAttrs targetMachines (_: {