diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-22 00:28:47 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-22 00:28:47 -0400 |
| commit | 7dc84e18247e8ad28505fb7ac708dcf55fda21ef (patch) | |
| tree | 2b7999c9e2332319cb14fbe4bf13b999614a7f7a /nixos/modules/installer/cd-dvd | |
| parent | 9addfc003fb1df07bc77c278399655b50b19400a (diff) | |
| download | nixlib-7dc84e18247e8ad28505fb7ac708dcf55fda21ef.tar nixlib-7dc84e18247e8ad28505fb7ac708dcf55fda21ef.tar.gz nixlib-7dc84e18247e8ad28505fb7ac708dcf55fda21ef.tar.bz2 nixlib-7dc84e18247e8ad28505fb7ac708dcf55fda21ef.tar.lz nixlib-7dc84e18247e8ad28505fb7ac708dcf55fda21ef.tar.xz nixlib-7dc84e18247e8ad28505fb7ac708dcf55fda21ef.tar.zst nixlib-7dc84e18247e8ad28505fb7ac708dcf55fda21ef.zip | |
installer: use sddm in plasma5
Slim is abandoned and won't work with wayland. It's in our best interest to use the display-manager that makes most sense for Plasma5, sddm. We've already moved on from it being default in #30890 and the graphical.nix profile, which the virtualbox profile uses, has sddm anyway.
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
3 files changed, 10 insertions, 13 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 719ba5ffb127..e0b558dcb0d8 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -22,17 +22,7 @@ with lib; }); ''; - services.xserver = { - enable = true; - - # Automatically login as nixos. - displayManager.slim = { - enable = true; - defaultUser = "nixos"; - autoLogin = true; - }; - - }; + services.xserver.enable = true; # Provide networkmanager for easy wireless configuration. networking.networkmanager.enable = true; 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 0b813bbf37b4..23c3426bff08 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -10,8 +10,6 @@ with lib; services.xserver.desktopManager.gnome3.enable = true; - services.xserver.displayManager.slim.enable = mkForce false; - # Auto-login as root. services.xserver.displayManager.gdm.autoLogin = { enable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 1dc7920ff640..6a10a6404e67 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -13,6 +13,15 @@ with lib; enable = true; enableQt4Support = false; }; + + # Automatically login as nixos. + displayManager.sddm = { + enable = true; + autoLogin = { + enable = true; + user = "nixos"; + }; + }; }; environment.systemPackages = with pkgs; [ |