aboutsummaryrefslogtreecommitdiff
path: root/nixos/doc
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2020-11-09 16:59:12 +0100
committerGitHub <noreply@github.com>2020-11-09 16:59:12 +0100
commitb839d4a8557adc80e522f674529e586ab2a88d23 (patch)
treee347e899e07fbdea88a755f58f98ad680829c398 /nixos/doc
parentda8c1a8192122c4da156656bf94b61f196390f1f (diff)
parentc9b669a2839b9a559470362c6c3de4f5a3ac4b3b (diff)
Merge pull request #98938 from raboof/nixos-manual-wayland
nixos.manual: introduce Wayland section
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/configuration/configuration.xml1
-rw-r--r--nixos/doc/manual/configuration/wayland.xml23
2 files changed, 24 insertions, 0 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 6eb8f50bacac..44ff1f1b571a 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -18,6 +18,7 @@
<xi:include href="user-mgmt.xml" />
<xi:include href="file-systems.xml" />
<xi:include href="x-windows.xml" />
+ <xi:include href="wayland.xml" />
<xi:include href="gpu-accel.xml" />
<xi:include href="xfce.xml" />
<xi:include href="networking.xml" />
diff --git a/nixos/doc/manual/configuration/wayland.xml b/nixos/doc/manual/configuration/wayland.xml
new file mode 100644
index 000000000000..231c219cf081
--- /dev/null
+++ b/nixos/doc/manual/configuration/wayland.xml
@@ -0,0 +1,23 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-wayland">
+ <title>Wayland</title>
+
+ <para>
+ While X11 (see <xref linkend="sec-x11"/>) is still the primary display
+ technology on NixOS, Wayland support is steadily improving.
+ Where X11 separates the X Server and the window manager, on Wayland those
+ are combined: a Wayland Compositor is like an X11 window manager, but also
+ embeds the Wayland 'Server' functionality. This means it is sufficient to
+ install a Wayland Compositor such as <package>sway</package> without
+ separately enabling a Wayland server:
+<programlisting>
+<xref linkend="opt-programs.sway.enable"/> = true;
+</programlisting>
+ This installs the <package>sway</package> compositor along with some
+ essential utilities. Now you can start <package>sway</package> from the TTY
+ console.
+ </para>
+</chapter>