about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-10-12 21:03:05 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-10-13 13:30:43 -0400
commited20a541c59f54e12824a867e1c288ef21963ea2 (patch)
tree31adf3a89a9867d204ef125e7fa5bd6690af8dae /nixos
parent018bba85bfc7ea4ac1b3694e0c302faf8cb2a050 (diff)
downloadnixlib-ed20a541c59f54e12824a867e1c288ef21963ea2.tar
nixlib-ed20a541c59f54e12824a867e1c288ef21963ea2.tar.gz
nixlib-ed20a541c59f54e12824a867e1c288ef21963ea2.tar.bz2
nixlib-ed20a541c59f54e12824a867e1c288ef21963ea2.tar.lz
nixlib-ed20a541c59f54e12824a867e1c288ef21963ea2.tar.xz
nixlib-ed20a541c59f54e12824a867e1c288ef21963ea2.tar.zst
nixlib-ed20a541c59f54e12824a867e1c288ef21963ea2.zip
nixos/gdm: don't conflict with plymouth-quit
Co-Authored-By: Tor Hedin Brønner <torhedinbronner@gmail.com>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 597fb57a1790..e5990aec4b9c 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -170,8 +170,9 @@ in
       "plymouth-start.service"
     ];
     systemd.services.display-manager.conflicts = [
-      "getty@tty${gdm.initialVT}.service"
-      "plymouth-quit.service"
+       "getty@tty${gdm.initialVT}.service"
+       # TODO: Add "plymouth-quit.service" so GDM can control when plymouth quits.
+       # Currently this breaks switching configurations while using plymouth.
     ];
     systemd.services.display-manager.onFailure = [
       "plymouth-quit.service"