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/modules/installer | |
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/modules/installer')
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix | 20 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 3707c4b7ec6..8c98691116d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -11,15 +11,17 @@ with lib; services.xserver.desktopManager.gnome3.enable = true; - services.xserver.displayManager.gdm = { - enable = true; - # autoSuspend makes the machine automatically suspend after inactivity. - # It's possible someone could/try to ssh'd into the machine and obviously - # have issues because it's inactive. - # See: - # * https://github.com/NixOS/nixpkgs/pull/63790 - # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22 - autoSuspend = false; + services.xserver.displayManager = { + gdm = { + enable = true; + # autoSuspend makes the machine automatically suspend after inactivity. + # It's possible someone could/try to ssh'd into the machine and obviously + # have issues because it's inactive. + # See: + # * https://github.com/NixOS/nixpkgs/pull/63790 + # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22 + autoSuspend = false; + }; autoLogin = { enable = true; user = "nixos"; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix index e76e06654ac..098c2b2870b 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix @@ -16,8 +16,8 @@ with lib; }; # Automatically login as nixos. - displayManager.sddm = { - enable = true; + displayManager = { + sddm.enable = true; autoLogin = { enable = true; user = "nixos"; |