summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-09-15 13:30:04 +0200
committerTor Hedin Brønner <torhedinbronner@gmail.com>2019-09-30 19:39:49 +0200
commitfc43be57f0f475e9f506ded26abc615ad1bac5e6 (patch)
tree93f0886dd4db41ec05ecf94dfdd9030bc915c448 /nixos
parent90b0e3c19f8c9d7af12de9fae7c7958a177ddbda (diff)
downloadnixpkgs-fc43be57f0f475e9f506ded26abc615ad1bac5e6.tar
nixpkgs-fc43be57f0f475e9f506ded26abc615ad1bac5e6.tar.gz
nixpkgs-fc43be57f0f475e9f506ded26abc615ad1bac5e6.tar.bz2
nixpkgs-fc43be57f0f475e9f506ded26abc615ad1bac5e6.tar.lz
nixpkgs-fc43be57f0f475e9f506ded26abc615ad1bac5e6.tar.xz
nixpkgs-fc43be57f0f475e9f506ded26abc615ad1bac5e6.tar.zst
nixpkgs-fc43be57f0f475e9f506ded26abc615ad1bac5e6.zip
nixos/gdm: start after getty@tty1
GDM is now killed if tty1 is started after gdm is launched. This follows
upstream's gdm service config.

This might cause problems with nixos-rebuild switch though. See the reasoning
and work that led to not following upstream on this:
  https://github.com/NixOS/nixpkgs/issues/21439
  4a180da
  c46d4da
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c785396613..8edefd592a1 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -159,6 +159,10 @@ in
       "rc-local.service"
       "systemd-machined.service"
       "systemd-user-sessions.service"
+      "getty@tty1.service"
+    ];
+    systemd.services.display-manager.conflicts = [
+      "getty@tty1.service"
     ];
 
     systemd.services.display-manager.serviceConfig = {