diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-12 06:43:50 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-09 21:15:35 -0400 |
commit | 490cd7889e3604d93187be54396b7114ce1bb0b5 (patch) | |
tree | fa6336125bb18ecc41de9f45fa6d03c190c46d9b /nixos/tests | |
parent | aba048f0bf2c5894fa431cdd7faf8406bd5dabde (diff) | |
download | nixpkgs-490cd7889e3604d93187be54396b7114ce1bb0b5.tar nixpkgs-490cd7889e3604d93187be54396b7114ce1bb0b5.tar.gz nixpkgs-490cd7889e3604d93187be54396b7114ce1bb0b5.tar.bz2 nixpkgs-490cd7889e3604d93187be54396b7114ce1bb0b5.tar.lz nixpkgs-490cd7889e3604d93187be54396b7114ce1bb0b5.tar.xz nixpkgs-490cd7889e3604d93187be54396b7114ce1bb0b5.tar.zst nixpkgs-490cd7889e3604d93187be54396b7114ce1bb0b5.zip |
nixos/displayManager: make autoLogin options independent of DM type
Co-authored-by: volth <volth@volth.com>
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/common/auto.nix | 4 | ||||
-rw-r--r-- | nixos/tests/gnome3-xorg.nix | 4 | ||||
-rw-r--r-- | nixos/tests/gnome3.nix | 4 | ||||
-rw-r--r-- | nixos/tests/plasma5.nix | 2 | ||||
-rw-r--r-- | nixos/tests/sddm.nix | 4 | ||||
-rw-r--r-- | nixos/tests/xfce.nix | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/nixos/tests/common/auto.nix b/nixos/tests/common/auto.nix index 2c21a8d5167..da6b14e9f16 100644 --- a/nixos/tests/common/auto.nix +++ b/nixos/tests/common/auto.nix @@ -41,8 +41,8 @@ in config = mkIf cfg.enable { - services.xserver.displayManager.lightdm = { - enable = true; + services.xserver.displayManager = { + lightdm.enable = true; autoLogin = { enable = true; user = cfg.user; diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome3-xorg.nix index b59badcd5de..61fcc930283 100644 --- a/nixos/tests/gnome3-xorg.nix +++ b/nixos/tests/gnome3-xorg.nix @@ -12,8 +12,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.enable = true; - services.xserver.displayManager.gdm = { - enable = true; + services.xserver.displayManager = { + gdm.enable = true; autoLogin = { enable = true; user = user.name; diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 17e72c5f651..509792515ce 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -11,8 +11,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.enable = true; - services.xserver.displayManager.gdm = { - enable = true; + services.xserver.displayManager = { + gdm.enable = true; autoLogin = { enable = true; user = "alice"; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 2eccfdf47f5..5a603f8cbfb 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.defaultSession = "plasma5"; services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.sddm.autoLogin = { + services.xserver.displayManager.autoLogin = { enable = true; user = "alice"; }; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index a145705250f..f9b961163c3 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -44,8 +44,8 @@ let machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; + services.xserver.displayManager = { + sddm.enable = true; autoLogin = { enable = true; user = "alice"; diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 99065669661..99e30342e59 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -11,8 +11,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { services.xserver.enable = true; - services.xserver.displayManager.lightdm = { - enable = true; + services.xserver.displayManager = { + lightdm.enable = true; autoLogin = { enable = true; user = "alice"; |