Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da8c1a819212
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b839d4a8557a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 1, 2020

  1. nixos.manual: introduce Wayland section 

    Co-Authored-By: Nicolas Berbiche <nicolas@normie.dev>
    @raboof @berbiche
    raboof and berbiche committed Nov 1, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c9b669a View commit details

Commits on Nov 9, 2020

  1. Merge pull request #98938 from raboof/nixos-manual-wayland 

    nixos.manual: introduce Wayland section
    @timokau
    timokau authored Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b839d4a View commit details
Showing with 24 additions and 0 deletions.
  1. +1 −0 nixos/doc/manual/configuration/configuration.xml
  2. +23 −0 nixos/doc/manual/configuration/wayland.xml
1 change: 1 addition & 0 deletions nixos/doc/manual/configuration/configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -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" />
23 changes: 23 additions & 0 deletions nixos/doc/manual/configuration/wayland.xml
View file
Original file line number Diff line number Diff line change
@@ -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>