chore: fix merge

tests/keycloak.nix

@@ -51,12 +51,6 @@ in
     };
   };
 
-# <<<<<<< HEAD
-#   testScript = { ... }: ''
-#       def puppeteer_run(cmd):
-#           client.succeed(f'puppeteer-run \'{cmd}\' ')
-#
-# =======
   testScript =
     { nodes, ... }:
     let
@@ -69,6 +63,8 @@ in
       wmClass = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
     in
     ''
+      def puppeteer_run(cmd):
+        client.succeed(f'puppeteer-run \'{cmd}\' ')
       start_all()
 
       acme_server.wait_for_unit("system.slice")

tests/support/client.nix

@@ -28,11 +28,11 @@ in
     pkgs.alacritty
   ];
 
-  services.getty.autologinUser = config.pub-solar-os.authentication.username;
+  services.getty.autologinUser = "b12f";
 
   virtualisation.qemu.options = [ "-vga std" ];
 
-  home-manager.users.${config.pub-solar-os.authentication.username} = {
+  home-manager.users.b12f = {
     programs.bash.profileExtra = ''
       [ "$(tty)" = "/dev/tty1" ] && exec systemd-cat --identifier=sway ${pkgs.sway}/bin/sway
     '';

tests/support/mail-server.nix

@@ -6,6 +6,7 @@
   imports = [
     flake.self.nixosModules.home-manager
     flake.self.nixosModules.core
+    flake.self.nixosModules.backups
     flake.self.nixosModules.mail
     flake.inputs.simple-nixos-mailserver.nixosModule
     ./global.nix