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 80af4c32e34..ce257b4c072 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
@@ -1915,7 +1915,10 @@
services.xserver.desktopManager.xfce now
includes Xfce’s screen locker,
- xfce4-screensaver.
+ xfce4-screensaver that is enabled by
+ default. You can disable it by setting
+ false to
+ services.xserver.desktopManager.xfce.enableScreensaver.
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 98e4010abef..408d77526a7 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -650,7 +650,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)).
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 0bb5c1268ca..88b21e59aaa 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -66,6 +66,12 @@ in
default = true;
description = "Enable the XFWM (default) window manager.";
};
+
+ enableScreensaver = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Enable the XFCE screensaver.";
+ };
};
};
@@ -99,7 +105,6 @@ in
ristretto
xfce4-appfinder
xfce4-notifyd
- xfce4-screensaver
xfce4-screenshooter
xfce4-session
xfce4-settings
@@ -123,7 +128,7 @@ in
] ++ optionals (!cfg.noDesktop) [
xfce4-panel
xfdesktop
- ];
+ ] ++ optional cfg.enableScreensaver xfce4-screensaver;
environment.pathsToLink = [
"/share/xfce4"
@@ -169,6 +174,6 @@ in
xfce4-notifyd
];
- security.pam.services.xfce4-screensaver.unixAuth = true;
+ security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver;
};
}