summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-08-20 14:25:25 +0200
committerlassulus <lassulus@lassul.us>2018-08-31 17:57:39 +0200
commitfc035da4a4a39d860e0edea0c95c6ca2de79e889 (patch)
tree5c68bd7b06f3c8901a74aa32d4d32da2729289ed /nixos/tests
parent678695fde54232610dc1b8c76f84e02aef955856 (diff)
downloadnixlib-fc035da4a4a39d860e0edea0c95c6ca2de79e889.tar
nixlib-fc035da4a4a39d860e0edea0c95c6ca2de79e889.tar.gz
nixlib-fc035da4a4a39d860e0edea0c95c6ca2de79e889.tar.bz2
nixlib-fc035da4a4a39d860e0edea0c95c6ca2de79e889.tar.lz
nixlib-fc035da4a4a39d860e0edea0c95c6ca2de79e889.tar.xz
nixlib-fc035da4a4a39d860e0edea0c95c6ca2de79e889.tar.zst
nixlib-fc035da4a4a39d860e0edea0c95c6ca2de79e889.zip
xserver.displayManager: change default
    Switch from slim to lightdm as the display-manager.
    If plasma5 is used as desktop-manager use sdddm.
    If gnome3 is used as desktop-manager use gdm.

    Based on #12516
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/gnome3-gdm.nix1
-rw-r--r--nixos/tests/gnome3.nix1
2 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 1f590f337fd9..959030d59880 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -11,7 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
-      services.xserver.displayManager.slim.enable = false;
       services.xserver.displayManager.gdm = {
         enable = true;
         autoLogin = {
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index af2404bf530c..3f0368592b8d 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
+      services.xserver.displayManager.gdm.enable = false;
       services.xserver.displayManager.lightdm.enable = true;
       services.xserver.displayManager.lightdm.autoLogin.enable = true;
       services.xserver.displayManager.lightdm.autoLogin.user = "alice";