From 54020c36a22db2dff3ed39e569c94a2e7857e8e9 Mon Sep 17 00:00:00 2001 From: Chris Marchesi Date: Thu, 23 Nov 2023 12:31:34 -0800 Subject: [PATCH] nixos/xscreensaver: init module This adds a NixOS module for XScreenSaver (from @aidalgol in #130218, with a few updates). The module: * Installs XScreenSaver * Sets up a suid wrapper for xscreensaver-auth * Sets up a user service for xscreensaver The suid wrapper should function correctly when xscreensaver is installed via the derivation update in 40a00547b71. Co-authored-by: Aidan Gauland Co-authored-by: Anderson Torres --- nixos/modules/module-list.nix | 1 + nixos/modules/services/x11/xscreensaver.nix | 40 +++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 nixos/modules/services/x11/xscreensaver.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cafde7f9efdf..2e2b94e5a97b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1406,6 +1406,7 @@ ./services/x11/xautolock.nix ./services/x11/xbanish.nix ./services/x11/xfs.nix + ./services/x11/xscreensaver.nix ./services/x11/xserver.nix ./system/activation/activatable-system.nix ./system/activation/activation-script.nix diff --git a/nixos/modules/services/x11/xscreensaver.nix b/nixos/modules/services/x11/xscreensaver.nix new file mode 100644 index 000000000000..dc269b892ebc --- /dev/null +++ b/nixos/modules/services/x11/xscreensaver.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.xscreensaver; +in +{ + options.services.xscreensaver = { + enable = lib.mkEnableOption "xscreensaver user service"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.xscreensaver; + defaultText = lib.literalExpression "pkgs.xscreensaver"; + description = "Which xscreensaver package to use."; + }; + }; + + config = lib.mkIf cfg.enable { + # Make xscreensaver-auth setuid root so that it can (try to) prevent the OOM + # killer from unlocking the screen. + security.wrappers.xscreensaver-auth = { + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.xscreensaver}/libexec/xscreensaver/xscreensaver-auth"; + }; + + systemd.user.services.xscreensaver = { + enable = true; + description = "XScreenSaver"; + after = [ "graphical-session-pre.target" ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + path = [ cfg.package ]; + serviceConfig.ExecStart = "${cfg.package}/bin/xscreensaver -no-splash"; + }; + }; + + meta.maintainers = with lib.maintainers; [ vancluever AndersonTorres ]; +}