From f691e6c074dabf48f8ecce86d00828636709efb7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 15 May 2021 16:37:32 +0200
Subject: [PATCH] nixos/tests/cagebreak: Simplify the startup

---
 nixos/tests/cagebreak.nix | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix
index 72b706de9a3..7b2c72bcafc 100644
--- a/nixos/tests/cagebreak.nix
+++ b/nixos/tests/cagebreak.nix
@@ -20,30 +20,21 @@ in
     # Automatically login on tty1 as a normal user:
     imports = [ ./common/user-account.nix ];
     services.getty.autologinUser = "alice";
+    programs.bash.loginShellInit = ''
+      if [ "$(tty)" = "/dev/tty1" ]; then
+        set -e
+
+        mkdir -p ~/.config/cagebreak
+        cp -f ${cagebreakConfigfile} ~/.config/cagebreak/config
+
+        cagebreak
+      fi
+    '';
 
     hardware.opengl.enable = true;
     programs.xwayland.enable = true;
     environment.systemPackages = [ pkgs.cagebreak pkgs.wallutils ];
 
-    systemd.services.setupCagebreakConfig = {
-      wantedBy = [ "multi-user.target" ];
-      before = [ "multi-user.target" ];
-      environment = {
-        HOME = alice.home;
-      };
-      unitConfig = {
-        type = "oneshot";
-        RemainAfterExit = true;
-        user = alice.name;
-      };
-      script = ''
-        cd $HOME
-        CONFFILE=$HOME/.config/cagebreak/config
-        mkdir -p $(dirname $CONFFILE)
-        cp ${cagebreakConfigfile} $CONFFILE
-      '';
-    };
-
     virtualisation.memorySize = 1024;
     # Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch:
     virtualisation.qemu.options = [ "-vga virtio" ];
@@ -57,8 +48,6 @@ in
   in ''
     start_all()
     machine.wait_for_unit("multi-user.target")
-    machine.wait_until_tty_matches(1, "alice\@machine")
-    machine.send_chars("cagebreak\n")
     machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0")
 
     with subtest("ensure wayland works with wayinfo from wallutils"):