diff options
| author | K900 <me@0upti.me> | 2023-06-23 17:41:57 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-07-07 12:46:59 +0300 |
| commit | c0132f22e935dbce8476fff255b3daf9f6e24ec3 (patch) | |
| tree | 85418238b056d414384db974574dacb421803b69 /nixos | |
| parent | 4f91766e8c58501176aa67e34a460e588f9a56fb (diff) | |
| download | nixlib-c0132f22e935dbce8476fff255b3daf9f6e24ec3.tar nixlib-c0132f22e935dbce8476fff255b3daf9f6e24ec3.tar.gz nixlib-c0132f22e935dbce8476fff255b3daf9f6e24ec3.tar.bz2 nixlib-c0132f22e935dbce8476fff255b3daf9f6e24ec3.tar.lz nixlib-c0132f22e935dbce8476fff255b3daf9f6e24ec3.tar.xz nixlib-c0132f22e935dbce8476fff255b3daf9f6e24ec3.tar.zst nixlib-c0132f22e935dbce8476fff255b3daf9f6e24ec3.zip | |
sddm: 0.19.0 -> 0.20.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 11 | ||||
| -rw-r--r-- | nixos/tests/sddm.nix | 14 |
2 files changed, 17 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 0ddeac0f1098..c04edd0d4b7a 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -268,6 +268,17 @@ in environment.systemPackages = [ sddm ]; services.dbus.packages = [ sddm ]; + # We're not using the upstream unit, so copy these: https://github.com/sddm/sddm/blob/develop/services/sddm.service.in + systemd.services.display-manager.after = [ + "systemd-user-sessions.service" + "getty@tty7.service" + "plymouth-quit.service" + "systemd-logind.service" + ]; + systemd.services.display-manager.conflicts = [ + "getty@tty7.service" + ]; + # To enable user switching, allow sddm to allocate TTYs/displays dynamically. services.xserver.tty = null; services.xserver.display = null; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index c76a9683e66d..b6c05deac05e 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -23,14 +23,14 @@ let enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' start_all() machine.wait_for_text("(?i)select your user") machine.screenshot("sddm") machine.send_chars("${user.password}\n") - machine.wait_for_file("${user.home}/.Xauthority") - machine.succeed("xauth merge ${user.home}/.Xauthority") + machine.wait_for_file("/tmp/xauth_*") + machine.succeed("xauth merge /tmp/xauth_*") machine.wait_for_window("^IceWM ") ''; }; @@ -55,12 +55,10 @@ let services.xserver.windowManager.icewm.enable = true; }; - testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; - in '' + testScript = { nodes, ... }: '' start_all() - machine.wait_for_file("${user.home}/.Xauthority") - machine.succeed("xauth merge ${user.home}/.Xauthority") + machine.wait_for_file("/tmp/xauth_*") + machine.succeed("xauth merge /tmp/xauth_*") machine.wait_for_window("^IceWM ") ''; }; |