diff options
Diffstat (limited to 'nixos/doc')
-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 | ||||
-rw-r--r-- | nixos/doc/manual/development/option-declarations.xml | 48 |
4 files changed, 31 insertions, 32 deletions
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 59a4e3b33ba1..30da064ac579 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 3040839861c1..93d10d19b208 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 7b60493e9df5..af6278e9c920 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> diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index ce432a7fa6ca..cab721f2e555 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -65,22 +65,22 @@ options = { </para> -<section xml:id="sec-option-declarations-eot"><title>Extensible Option +<section xml:id="sec-option-declarations-eot"><title>Extensible Option Types</title> - <para>Extensible option types is a feature that allow to extend certain types + <para>Extensible option types is a feature that allow to extend certain types declaration through multiple module files. - This feature only work with a restricted set of types, namely + This feature only work with a restricted set of types, namely <literal>enum</literal> and <literal>submodules</literal> and any composed forms of them.</para> - <para>Extensible option types can be used for <literal>enum</literal> options - that affects multiple modules, or as an alternative to related + <para>Extensible option types can be used for <literal>enum</literal> options + that affects multiple modules, or as an alternative to related <literal>enable</literal> options.</para> <para>As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a - module file per display manager backend (slim, kdm, gdm ...). + module file per display manager backend (slim, sddm, gdm ...). </para> <para>There are two approach to this module structure: @@ -96,7 +96,7 @@ options = { </para> <para>Both approachs have problems.</para> - + <para>Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type system can not enforce this restriction as there is no relation between @@ -108,18 +108,18 @@ options = { central module will require to change the central module option every time a new backend is added or removed.</para> - <para>By using extensible option types, it is possible to create a placeholder - option in the central module (<xref linkend='ex-option-declaration-eot-service' - />), and to extend it in each backend module (<xref - linkend='ex-option-declaration-eot-backend-slim' />, <xref - linkend='ex-option-declaration-eot-backend-kdm' />).</para> - + <para>By using extensible option types, it is possible to create a placeholder + option in the central module (<xref linkend='ex-option-declaration-eot-service' + />), and to extend it in each backend module (<xref + linkend='ex-option-declaration-eot-backend-slim' />, <xref + linkend='ex-option-declaration-eot-backend-sddm' />).</para> + <para>As a result, <literal>displayManager.enable</literal> option values can be added without changing the main service module file and the type system automatically enforce that there can only be a single display manager enabled.</para> -<example xml:id='ex-option-declaration-eot-service'><title>Extensible type +<example xml:id='ex-option-declaration-eot-service'><title>Extensible type placeholder in the service module</title> <screen> services.xserver.displayManager.enable = mkOption { @@ -127,29 +127,29 @@ services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ ]); };</screen></example> -<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending - <literal>services.xserver.displayManager.enable</literal> in the +<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending + <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module</title> <screen> services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "slim" ]); };</screen></example> -<example xml:id='ex-option-declaration-eot-backend-kdm'><title>Extending - <literal>services.foo.backend</literal> in the <literal>kdm</literal> +<example xml:id='ex-option-declaration-eot-backend-sdm'><title>Extending + <literal>services.foo.backend</literal> in the <literal>sdm</literal> module</title> <screen> services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "kdm" ]); + type = with types; nullOr (enum [ "sddm" ]); };</screen></example> -<para>The placeholder declaration is a standard <literal>mkOption</literal> - declaration, but it is important that extensible option declarations only use +<para>The placeholder declaration is a standard <literal>mkOption</literal> + declaration, but it is important that extensible option declarations only use the <literal>type</literal> argument.</para> -<para>Extensible option types work with any of the composed variants of - <literal>enum</literal> such as - <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> +<para>Extensible option types work with any of the composed variants of + <literal>enum</literal> such as + <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar" ])</literal>.</para> </section> |