about summary refs log tree commit diff
path: root/nixos/tests/common
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2024-02-27 21:28:05 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2024-04-08 21:56:38 +0200
commit476b8c276e2ae4c98efd1d8d759029e170c5ca98 (patch)
treecc5bcb19fd25ef4cfa33e2d3feb5b950b407fa51 /nixos/tests/common
parent5598d81e949c37d5b8668182dea1a4418f209ed9 (diff)
treewide: rename renamed sddm/displayManager settings
Diffstat (limited to 'nixos/tests/common')
-rw-r--r--nixos/tests/common/auto.nix10
-rw-r--r--nixos/tests/common/x11.nix2
2 files changed, 5 insertions, 7 deletions
diff --git a/nixos/tests/common/auto.nix b/nixos/tests/common/auto.nix
index ac56bed4a88f1..a2e42e59c0442 100644
--- a/nixos/tests/common/auto.nix
+++ b/nixos/tests/common/auto.nix
@@ -30,12 +30,10 @@ in
   ###### implementation
 
   config = lib.mkIf cfg.enable {
-    services.xserver.displayManager = {
-      lightdm.enable = true;
-      autoLogin = {
-        enable = true;
-        user = cfg.user;
-      };
+    services.xserver.displayManager.lightdm.enable = true;
+    services.displayManager.autoLogin = {
+      enable = true;
+      user = cfg.user;
     };
 
     # lightdm by default doesn't allow auto login for root, which is
diff --git a/nixos/tests/common/x11.nix b/nixos/tests/common/x11.nix
index 0d76a0e972ff5..b79cedb864de4 100644
--- a/nixos/tests/common/x11.nix
+++ b/nixos/tests/common/x11.nix
@@ -12,6 +12,6 @@
 
   # Use IceWM as the window manager.
   # Don't use a desktop manager.
-  services.xserver.displayManager.defaultSession = lib.mkDefault "none+icewm";
+  services.displayManager.defaultSession = lib.mkDefault "none+icewm";
   services.xserver.windowManager.icewm.enable = true;
 }