Unverified Commit 4cc6ce45 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #291913 from SuperSandro2000/sddm-wayland-only

parents 1dd37934 476b8c27

nixos/doc/manual/configuration/modularity.section.md

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Here, we include two modules from the same directory, `vpn.nix` and 
{ config, pkgs, ... }:



{ services.xserver.enable = true;

  services.xserver.displayManager.sddm.enable = true;

  services.displayManager.sddm.enable = true;

  services.xserver.desktopManager.plasma5.enable = true;

  environment.systemPackages = [ pkgs.vim ];

}

nixos/doc/manual/configuration/profiles/demo.section.md

+1 −1
Original line number Diff line number Diff line 
# Demo {#sec-profile-demo}



This profile just enables a `demo` user, with password `demo`, uid `1000`, `wheel` group and

[autologin in the SDDM display manager](#opt-services.xserver.displayManager.autoLogin).
 
[autologin in the SDDM display manager](#opt-services.displayManager.autoLogin).

nixos/doc/manual/configuration/profiles/graphical.section.md

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Defines a NixOS configuration with the Plasma 5 desktop. It's used by the 
graphical installation CD.



It sets [](#opt-services.xserver.enable),

[](#opt-services.xserver.displayManager.sddm.enable),

[](#opt-services.displayManager.sddm.enable),

[](#opt-services.xserver.desktopManager.plasma5.enable),

and [](#opt-services.xserver.libinput.enable) to true. It also

includes glxinfo and firefox in the system packages list.

nixos/doc/manual/configuration/x-windows.chapter.md

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ alternative one by picking one of the following lines: 


```nix

{

  services.xserver.displayManager.sddm.enable = true;

  services.displayManager.sddm.enable = true;

  services.xserver.displayManager.gdm.enable = true;

}

```
@@ -99,7 +99,7 @@ your window manager, you'd define: 


```nix

{

  services.xserver.displayManager.defaultSession = "none+i3";

  services.displayManager.defaultSession = "none+i3";

}

```
@@ -109,8 +109,8 @@ using lightdm for a user `alice`: 
```nix

{

  services.xserver.displayManager.lightdm.enable = true;

  services.xserver.displayManager.autoLogin.enable = true;

  services.xserver.displayManager.autoLogin.user = "alice";

  services.displayManager.autoLogin.enable = true;

  services.displayManager.autoLogin.user = "alice";

}

```

nixos/doc/manual/configuration/xfce.chapter.md

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ To enable the Xfce Desktop Environment, set 
```nix

{

  services.xserver.desktopManager.xfce.enable = true;

  services.xserver.displayManager.defaultSession = "xfce";

  services.displayManager.defaultSession = "xfce";

}

```