diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-23 07:39:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 07:39:48 -0500 |
| commit | 65bdc05ae8059fbaac4479eca7a422db9a1e5870 (patch) | |
| tree | 075bec006982bf05f91887ba38f22251079910a1 /nixos/modules/installer/cd-dvd | |
| parent | dd4cf6639baaa51345ba967ed51e25c6c492cf65 (diff) | |
| parent | ad4565caa1a8ecaee79295178b07c07273b478d8 (diff) | |
Merge pull request #78935 from worldofpeace/update-gnome3-iso-expression
installation-cd-graphical-gnome: updates
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix | 21 |
1 files changed, 16 insertions, 5 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 23c3426bff08..62cbdbcfd17b 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -1,5 +1,4 @@ -# This module defines a NixOS installation CD that contains X11 and -# GNOME 3. +# This module defines a NixOS installation CD that contains GNOME. { lib, ... }: @@ -10,10 +9,22 @@ with lib; services.xserver.desktopManager.gnome3.enable = true; - # Auto-login as root. - services.xserver.displayManager.gdm.autoLogin = { + # Wayland can be problematic for some hardware like Nvidia graphics cards. + services.xserver.displayManager.defaultSession = "gnome-xorg"; + + services.xserver.displayManager.gdm = { enable = true; - user = "root"; + # 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"; + }; }; } |