about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--modules/user/openlab/labtops.nix5
-rw-r--r--tests/aszlig/programs/psi.nix3
-rw-r--r--tests/programs/gnupg/default.nix2
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/user/openlab/labtops.nix b/modules/user/openlab/labtops.nix
index ea745c20..14aaff05 100644
--- a/modules/user/openlab/labtops.nix
+++ b/modules/user/openlab/labtops.nix
@@ -76,8 +76,9 @@ in
       xkbOptions = "eurosign:e";
 
       displayManager = {
-        auto.enable = true;
-        auto.user = "openlab";
+        lightdm.enable = true;
+        lightdm.autoLogin.enable = true;
+        lightdm.autoLogin.user = "openlab";
         sessionCommands = with pkgs; ''
           ${xorg.xset}/bin/xset r rate 250 35
         '';
diff --git a/tests/aszlig/programs/psi.nix b/tests/aszlig/programs/psi.nix
index 5ab34da3..0b6643f8 100644
--- a/tests/aszlig/programs/psi.nix
+++ b/tests/aszlig/programs/psi.nix
@@ -8,8 +8,7 @@
       "${nixpkgsPath}/nixos/tests/common/user-account.nix"
       "${nixpkgsPath}/nixos/tests/common/x11.nix"
     ];
-    services.xserver.displayManager.auto.enable = true;
-    services.xserver.displayManager.auto.user = "alice";
+    test-support.displayManager.auto.user = "alice";
     environment.systemPackages = [ pkgs.vuizvui.aszlig.psi ];
   };
 
diff --git a/tests/programs/gnupg/default.nix b/tests/programs/gnupg/default.nix
index 064770c9..504f6e46 100644
--- a/tests/programs/gnupg/default.nix
+++ b/tests/programs/gnupg/default.nix
@@ -31,7 +31,7 @@ in {
     ) [ "user-account" "x11" ];
 
     services.openssh.enable = true;
-    services.xserver.displayManager.auto.user = "alice";
+    test-support.displayManager.auto.user = "alice";
 
     vuizvui.programs.gnupg.enable = true;
     vuizvui.programs.gnupg.agent.enable = true;