From ba50d4840063bcc8cd662c48262c90102ec7132a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 1 May 2015 17:11:00 -0400
Subject: [PATCH] mbpfan: service improvements

* add verbosity setting
* don't set mbpfan as a setuid program
---
 nixos/modules/services/misc/mbpfan.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index 2767520d78f7..3fb5f684b761 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.mbpfan;
+  verbose = if cfg.verbose then "v" else "";
 
 in {
   options.services.mbpfan = {
@@ -69,13 +70,19 @@ in {
         The polling interval.
       '';
     };
+
+    verbose = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        If true, sets the log level to verbose.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
     boot.kernelModules = [ "coretemp" "applesmc" ];
 
-    security.setuidPrograms = [ "mbpfan" ];
-
     environment = {
       etc."mbpfan.conf".text = ''
         [general]
@@ -96,7 +103,7 @@ in {
       restartTriggers = [ config.environment.etc."mbpfan.conf".source ];
       serviceConfig = {
         Type = "simple";
-        ExecStart = "${cfg.package}/bin/mbpfan -fv";
+        ExecStart = "${cfg.package}/bin/mbpfan -f${verbose}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         PIDFile = "/var/run/mbpfan.pid";
         Restart = "always";