From b87c36604642669d05381f06ac94af1b21f1ce30 Mon Sep 17 00:00:00 2001
From: Paul Schyska <paul@schyska.net>
Date: Sun, 16 May 2021 18:19:27 +0200
Subject: nixos/atop: Never enable setuidWrapper by default, rename
 service/timer enabling options

---
 nixos/modules/programs/atop.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'nixos/modules/programs/atop.nix')

diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index d1577b32adfb0..3e69e882eaece 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -52,7 +52,7 @@ in
 
       setuidWrapper.enable = mkOption {
         type = types.bool;
-        default = cfg.netatop.enable || cfg.atopgpu.enable;
+        default = false;
         description = ''
           Whether to install a setuid wrapper for Atop. This is required to use some of
           the features as non-root user (e.g.: ipc information, netatop, atopgpu).
@@ -60,7 +60,7 @@ in
         '';
       };
 
-      atopsvc.enable = mkOption {
+      atopService.enable = mkOption {
         type = types.bool;
         default = true;
         description = ''
@@ -68,7 +68,7 @@ in
           long-term analysis.
         '';
       };
-      atopRotate.enable = mkOption {
+      atopRotateTimer.enable = mkOption {
         type = types.bool;
         default = true;
         description = ''
@@ -76,7 +76,7 @@ in
           daily to make sure the data files are rotate.
         '';
       };
-      atopacct.enable = mkOption {
+      atopacctService.enable = mkOption {
         type = types.bool;
         default = true;
         description = ''
@@ -133,11 +133,11 @@ in
         {
           inherit packages;
           services =
-            mkService cfg.atopsvc.enable "atop"
-            // mkService cfg.atopacct.enable "atopacct"
+            mkService cfg.atopService.enable "atop"
+            // mkService cfg.atopacctService.enable "atopacct"
             // mkService cfg.netatop.enable "netatop"
             // mkService cfg.atopgpu.enable "atopgpu";
-          timers = mkTimer cfg.atopRotate.enable "atop-rotate";
+          timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate";
         };
       security.wrappers =
         lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; };
-- 
cgit 1.4.1