mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
c464c44a42
Since DEs like KDE Plasma 6, GNOME and COSMIC are not designed to be X11-exclusive, putting them under `services.xserver` is misleading. In particular, GNOME defaults to Wayland these days and X11 support is going to be dropped in near future. Let’s follow Plasma and move GNOME NixOS options out of `xserver` attribute. This patch does not include any changes to X11 support itself. Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
59 lines
1.8 KiB
Nix
59 lines
1.8 KiB
Nix
{ pkgs, lib, ... }:
|
|
{
|
|
name = "gnome-flashback";
|
|
meta.maintainers = lib.teams.gnome.members ++ [ lib.maintainers.chpatrick ];
|
|
|
|
nodes.machine =
|
|
{ nodes, ... }:
|
|
let
|
|
user = nodes.machine.users.users.alice;
|
|
in
|
|
|
|
{
|
|
imports = [ ./common/user-account.nix ];
|
|
|
|
services.xserver.enable = true;
|
|
|
|
services.displayManager.gdm = {
|
|
enable = true;
|
|
debug = true;
|
|
};
|
|
|
|
services.displayManager.autoLogin = {
|
|
enable = true;
|
|
user = user.name;
|
|
};
|
|
|
|
services.desktopManager.gnome.enable = true;
|
|
services.desktopManager.gnome.debug = true;
|
|
services.desktopManager.gnome.flashback.enableMetacity = true;
|
|
services.displayManager.defaultSession = "gnome-flashback-metacity";
|
|
};
|
|
|
|
testScript =
|
|
{ nodes, ... }:
|
|
let
|
|
user = nodes.machine.users.users.alice;
|
|
uid = toString user.uid;
|
|
xauthority = "/run/user/${uid}/gdm/Xauthority";
|
|
in
|
|
''
|
|
with subtest("Login to GNOME Flashback with GDM"):
|
|
machine.wait_for_x()
|
|
machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
|
|
# Wait for alice to be logged in"
|
|
machine.wait_for_unit("default.target", "${user.name}")
|
|
machine.wait_for_file("${xauthority}")
|
|
machine.succeed("xauth merge ${xauthority}")
|
|
# Check that logging in has given the user ownership of devices
|
|
assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
|
|
|
|
with subtest("Wait for Metacity"):
|
|
machine.wait_until_succeeds("pgrep metacity")
|
|
|
|
with subtest("Regression test for #233920"):
|
|
machine.wait_until_succeeds("pgrep -fa gnome-flashback-media-keys")
|
|
machine.sleep(20)
|
|
machine.screenshot("screen")
|
|
'';
|
|
}
|