public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests/cagebreak: Simplify the startup

Browse Source
This commit is contained in:
Michael Weiss 2021-05-15 16:37:32 +02:00
parent 81b2ce96c6
commit f691e6c074
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/tests/cagebreak.nix
View File

@ -20,30 +20,21 @@ in
# Automatically login on tty1 as a normal user: # Automatically login on tty1 as a normal user:
imports = [ ./common/user-account.nix ]; imports = [ ./common/user-account.nix ];
services.getty.autologinUser = "alice"; 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; hardware.opengl.enable = true;
programs.xwayland.enable = true; programs.xwayland.enable = true;
environment.systemPackages = [ pkgs.cagebreak pkgs.wallutils ]; 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; virtualisation.memorySize = 1024;
# Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch: # 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" ]; virtualisation.qemu.options = [ "-vga virtio" ];
@ -57,8 +48,6 @@ in
in '' in ''
start_all() start_all()
machine.wait_for_unit("multi-user.target") 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") machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0")
with subtest("ensure wayland works with wayinfo from wallutils"): with subtest("ensure wayland works with wayinfo from wallutils"):