mirror of
https://github.com/nix-community/home-manager.git
synced 2025-12-06 17:11:03 +01:00
7419250703
This commit converts `package = mkOption` declarations throughout the
codebase to use the more modern and consistent `lib.mkPackageOption`
function.
Key changes:
- Simple package options: `mkOption { type = types.package; default = pkgs.foo; }`
becomes `lib.mkPackageOption pkgs "foo" { }`
- Package set options: Uses correct package set as first argument with
`pkgsText` parameter (e.g., `lib.mkPackageOption pkgs.vimPlugins "plugin" { pkgsText = "pkgs.vimPlugins"; }`)
- Removes redundant descriptions that just restate the package name
- Preserves examples and extra context where meaningful
- Handles submodule plugin options properly with `null` defaults
This modernizes the option declarations and makes them more consistent
with current nixpkgs patterns while maintaining full backward compatibility.
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
75 lines
1.6 KiB
Nix
75 lines
1.6 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
|
|
let
|
|
inherit (lib)
|
|
mkOption
|
|
types
|
|
;
|
|
|
|
cfg = config.services.unclutter;
|
|
|
|
in
|
|
{
|
|
options.services.unclutter = {
|
|
|
|
enable = lib.mkEnableOption "unclutter";
|
|
|
|
package = lib.mkPackageOption pkgs "unclutter-xfixes" { };
|
|
|
|
timeout = mkOption {
|
|
description = "Number of seconds before the cursor is marked inactive.";
|
|
type = types.int;
|
|
default = 1;
|
|
};
|
|
|
|
threshold = mkOption {
|
|
description = "Minimum number of pixels considered cursor movement.";
|
|
type = types.int;
|
|
default = 1;
|
|
};
|
|
|
|
extraOptions = mkOption {
|
|
description = "More arguments to pass to the unclutter command.";
|
|
type = types.listOf types.str;
|
|
default = [ ];
|
|
example = [
|
|
"exclude-root"
|
|
"ignore-scrolling"
|
|
];
|
|
};
|
|
};
|
|
|
|
config = lib.mkIf cfg.enable {
|
|
assertions = [
|
|
(lib.hm.assertions.assertPlatform "services.unclutter" pkgs lib.platforms.linux)
|
|
];
|
|
|
|
systemd.user.services.unclutter = {
|
|
Unit = {
|
|
Description = "unclutter";
|
|
After = [ "graphical-session.target" ];
|
|
PartOf = [ "graphical-session.target" ];
|
|
};
|
|
|
|
Service = {
|
|
ExecStart = ''
|
|
${cfg.package}/bin/unclutter \
|
|
--timeout ${toString cfg.timeout} \
|
|
--jitter ${toString (cfg.threshold - 1)} \
|
|
${lib.concatMapStrings (x: " --${x}") cfg.extraOptions}
|
|
'';
|
|
RestartSec = 3;
|
|
Restart = "always";
|
|
};
|
|
|
|
Install = {
|
|
WantedBy = [ "graphical-session.target" ];
|
|
};
|
|
};
|
|
};
|
|
}
|