summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorlucasew <lucas59356@gmail.com>2022-04-10 20:38:57 -0300
committerlucasew <lucas59356@gmail.com>2022-04-13 09:13:03 -0300
commite76aa74c2824cf0a66a463b67b9b93a2c0cfc046 (patch)
tree1d047fe8fbc6e38ef42613464e422c1edc206ac6 /nixos/doc
parent7c36b7246b1f429c67f2bac6e3c0dd212d14dea2 (diff)
downloadnixpkgs-e76aa74c2824cf0a66a463b67b9b93a2c0cfc046.tar
nixpkgs-e76aa74c2824cf0a66a463b67b9b93a2c0cfc046.tar.gz
nixpkgs-e76aa74c2824cf0a66a463b67b9b93a2c0cfc046.tar.bz2
nixpkgs-e76aa74c2824cf0a66a463b67b9b93a2c0cfc046.tar.lz
nixpkgs-e76aa74c2824cf0a66a463b67b9b93a2c0cfc046.tar.xz
nixpkgs-e76aa74c2824cf0a66a463b67b9b93a2c0cfc046.tar.zst
nixpkgs-e76aa74c2824cf0a66a463b67b9b93a2c0cfc046.zip
nixos/xfce: option to disable xfce4-screensaver
Signed-off-by: lucasew <lucas59356@gmail.com>
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml5
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md2
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index ceb9ca53716..0f03c754bdf 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1880,7 +1880,10 @@
         <para>
           <literal>services.xserver.desktopManager.xfce</literal> now
           includes Xfce’s screen locker,
-          <literal>xfce4-screensaver</literal>.
+          <literal>xfce4-screensaver</literal> that is enabled by
+          default. You can disable it by setting
+          <literal>false</literal> to
+          <link linkend="opt-services.xserver.desktopManager.xfce.enableScreensaver">services.xserver.desktopManager.xfce.enableScreensaver</link>.
         </para>
       </listitem>
       <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index ff628d00725..d75c5e15b34 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -642,7 +642,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 - xfsprogs was update to version 5.15, which enables inobtcount and bigtime by default on filesystem creation. Support for these features was added in kernel 5.10 and deemed stable in kernel 5.15.
   If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than 5.10, you need to format them with `mkfs.xfs -m bigtime=0 -m inobtcount=0`.
 
-- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver`.
+- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver` that is enabled by default. You can disable it by setting `false` to [services.xserver.desktopManager.xfce.enableScreensaver](#opt-services.xserver.desktopManager.xfce.enableScreensaver).
 
 - The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).