mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 13:10:33 +00:00
1e95e114e5
While systemd suggests using the pre-defined graphical-session user target, I found that this interface is difficult to use. Additionally, no other major distribution, even in their unstable versions, currently use this mechanism. The window or desktop manager is supposed to run in a systemd user service which activates graphical-session.target and the user services that are binding to this target. The issue is that we can't elegantly pass the xsession environment to the window manager session, in particular whereas the PassEnvironment option does work for DISPLAY, it for some mysterious reason won't for PATH. This commit implements a new graphical user target that works just like default.target. Services which should be run in a graphical session just need to declare wantedBy graphical.target. The graphical target will be activated in the xsession before executing the window or display manager. Fixes #17858.
75 lines
2 KiB
Nix
75 lines
2 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
|
|
let cfg = config.services.unclutter;
|
|
|
|
in {
|
|
options.services.unclutter = {
|
|
|
|
enable = mkOption {
|
|
description = "Enable unclutter to hide your mouse cursor when inactive";
|
|
type = types.bool;
|
|
default = false;
|
|
};
|
|
|
|
package = mkOption {
|
|
type = types.package;
|
|
default = pkgs.unclutter;
|
|
defaultText = "pkgs.unclutter";
|
|
description = "unclutter derivation to use.";
|
|
};
|
|
|
|
keystroke = mkOption {
|
|
description = "Wait for a keystroke before hiding the cursor";
|
|
type = types.bool;
|
|
default = false;
|
|
};
|
|
|
|
timeout = mkOption {
|
|
description = "Number of seconds before the cursor is marked inactive";
|
|
type = types.int;
|
|
default = 1;
|
|
};
|
|
|
|
threeshold = mkOption {
|
|
description = "Minimum number of pixels considered cursor movement";
|
|
type = types.int;
|
|
default = 1;
|
|
};
|
|
|
|
excluded = mkOption {
|
|
description = "Names of windows where unclutter should not apply";
|
|
type = types.listOf types.str;
|
|
default = [];
|
|
example = [ "" ];
|
|
};
|
|
|
|
extraOptions = mkOption {
|
|
description = "More arguments to pass to the unclutter command";
|
|
type = types.listOf types.str;
|
|
default = [];
|
|
example = [ "noevent" "grab" ];
|
|
};
|
|
};
|
|
|
|
config = mkIf cfg.enable {
|
|
systemd.user.services.unclutter = {
|
|
description = "unclutter";
|
|
wantedBy = [ "graphical-session.target" ];
|
|
partOf = [ "graphical-session.target" ];
|
|
serviceConfig.ExecStart = ''
|
|
${cfg.package}/bin/unclutter \
|
|
-idle ${toString cfg.timeout} \
|
|
-jitter ${toString (cfg.threeshold - 1)} \
|
|
${optionalString cfg.keystroke "-keystroke"} \
|
|
${concatMapStrings (x: " -"+x) cfg.extraOptions} \
|
|
-not ${concatStringsSep " " cfg.excluded} \
|
|
'';
|
|
serviceConfig.PassEnvironment = "DISPLAY";
|
|
serviceConfig.RestartSec = 3;
|
|
serviceConfig.Restart = "always";
|
|
};
|
|
};
|
|
}
|