diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-02-09 21:25:03 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-02-09 21:52:00 -0500 |
| commit | b12564cc1b8319b317d98df03fec8ba4bbf71877 (patch) | |
| tree | c0a656ef4db5d571760b9d4265c4d57ba425d7c6 /nixos/doc/manual/configuration | |
| parent | 400048926602dfe559207123267b183ac7e97c6b (diff) | |
| download | nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.gz nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.bz2 nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.lz nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.xz nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.zst nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.zip | |
nixos: update default cases from KDM/KDE4 to SDDM/KDE5
Diffstat (limited to 'nixos/doc/manual/configuration')
| -rw-r--r-- | nixos/doc/manual/configuration/modularity.xml | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/configuration/x-windows.xml | 6 | ||||
| -rw-r--r-- | nixos/doc/manual/configuration/xfce.xml | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 59a4e3b33ba..30da064ac57 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -36,9 +36,8 @@ latter might look like this: { config, pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; - environment.systemPackages = [ pkgs.kde4.kscreensaver ]; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.kde5.enable = true; } </programlisting> diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 3040839861c..93d10d19b20 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated <command>xterm</command> window. Thus you should pick one or more of the following lines: <programlisting> -services.xserver.desktopManager.kde4.enable = true; +services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.xfce.enable = true; services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.twm.enable = true; @@ -35,9 +35,9 @@ services.xserver.windowManager.icewm.enable = true; <para>NixOS’s default <emphasis>display manager</emphasis> (the program that provides a graphical login prompt and manages the X -server) is SLiM. You can select KDE’s <command>kdm</command> instead: +server) is SLiM. You can select KDE’s <command>sddm</command> instead: <programlisting> -services.xserver.displayManager.kdm.enable = true; +services.xserver.displayManager.sddm.enable = true; </programlisting> </para> diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 7b60493e9df..af6278e9c92 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -41,9 +41,9 @@ (DM is the program that provides a graphical login prompt and manages the X server.) You can, for example, select KDE’s - <command>kdm</command> instead: + <command>sddm</command> instead: <programlisting> - services.xserver.displayManager.kdm.enable = true; + services.xserver.displayManager.sddm.enable = true; </programlisting> </para> |