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

nixos/atop: Split up restart triggers between atop and netatop

Browse Source
This commit is contained in:
Paul Schyska 2021-05-16 22:00:24 +02:00
parent 526bc6a4d5
commit 563ba07543
No known key found for this signature in database
GPG Key ID: D49D4F8259DB724F
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nixos/modules/programs/atop.nix
View File

@ -107,7 +107,6 @@ in
(cfg.package.override { withAtopgpu = true; }) (cfg.package.override { withAtopgpu = true; })
else else
cfg.package; cfg.package;
packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
in in
{ {
environment.etc = mkIf (cfg.settings != { }) { environment.etc = mkIf (cfg.settings != { }) {
@ -118,13 +117,13 @@ in
'') '')
cfg.settings); cfg.settings);
}; };
environment.systemPackages = packages; environment.systemPackages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
systemd = systemd =
let let
mkSystemd = type: cond: name: { mkSystemd = type: cond: name: restartTriggers: {
${name} = lib.mkIf cond { ${name} = lib.mkIf cond {
restartTriggers = packages; inherit restartTriggers;
wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ]; wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ];
}; };
}; };
@ -132,13 +131,13 @@ in
mkTimer = mkSystemd "timers"; mkTimer = mkSystemd "timers";
in in
{ {
inherit packages; packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
services = services =
mkService cfg.atopService.enable "atop" mkService cfg.atopService.enable "atop" [ atop ]
// mkService cfg.atopacctService.enable "atopacct" // mkService cfg.atopacctService.enable "atopacct" [ atop ]
// mkService cfg.netatop.enable "netatop" // mkService cfg.netatop.enable "netatop" [ cfg.netatop.package ]
// mkService cfg.atopgpu.enable "atopgpu"; // mkService cfg.atopgpu.enable "atopgpu" [ atop ];
timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate"; timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ];
}; };
security.wrappers = security.wrappers =
lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; }; lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; };