JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #114568 from rnhmjoj/acpid-no-udev-settle

Browse Source 
nixos/acpid: clean up the module
This commit is contained in:
Michele Guerini Rocco 2021-02-28 09:19:14 +01:00 committed by GitHub
commit f3ae13d608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/modules/services/hardware/acpid.nix
View File

@ -3,21 +3,22 @@
with lib; with lib;
let let
cfg = config.services.acpid;
canonicalHandlers = { canonicalHandlers = {
powerEvent = { powerEvent = {
event = "button/power.*"; event = "button/power.*";
action = config.services.acpid.powerEventCommands; action = cfg.powerEventCommands;
}; };
lidEvent = { lidEvent = {
event = "button/lid.*"; event = "button/lid.*";
action = config.services.acpid.lidEventCommands; action = cfg.lidEventCommands;
}; };
acEvent = { acEvent = {
event = "ac_adapter.*"; event = "ac_adapter.*";
action = config.services.acpid.acEventCommands; action = cfg.acEventCommands;
}; };
}; };
@ -33,7 +34,7 @@ let
echo "event=${handler.event}" > $fn echo "event=${handler.event}" > $fn
echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn
''; '';
in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers)) in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // cfg.handlers))
} }
''; '';
@ -47,11 +48,7 @@ in
services.acpid = { services.acpid = {
enable = mkOption { enable = mkEnableOption "the ACPI daemon";
type = types.bool;
default = false;
description = "Whether to enable the ACPI daemon.";
};
logEvents = mkOption { logEvents = mkOption {
type = types.bool; type = types.bool;
@ -129,26 +126,28 @@ in
###### implementation ###### implementation
config = mkIf config.services.acpid.enable { config = mkIf cfg.enable {
systemd.services.acpid = { systemd.services.acpid = {
description = "ACPI Daemon"; description = "ACPI Daemon";
documentation = [ "man:acpid(8)" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "systemd-udev-settle.service" ];
path = [ pkgs.acpid ];
serviceConfig = { serviceConfig = {
Type = "forking"; ExecStart = escapeShellArgs
([ "${pkgs.acpid}/bin/acpid"
"--foreground"
"--netlink"
"--confdir" "${acpiConfDir}"
] ++ optional cfg.logEvents "--logevents"
);
}; };
unitConfig = { unitConfig = {
ConditionVirtualization = "!systemd-nspawn"; ConditionVirtualization = "!systemd-nspawn";
ConditionPathExists = [ "/proc/acpi" ]; ConditionPathExists = [ "/proc/acpi" ];
}; };
script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}";
}; };
}; };