commit dad7e8f4747877c708962d11419718aca1644ae8 · pyrox.dev/nixpkgs

+10 -5

nixos/modules/hardware/sensor/hddtemp.nix

···

       9
       9
        
       

     

       10
       10
        
         cfg = config.hardware.sensor.hddtemp;

     

       11
       11
        
       

     

       12
       12
       -
         wrapper = pkgs.writeShellScript "hddtemp-wrapper" ''

     

       12
       12
       +
         script = ''

     

       13
       13
        
           set -eEuo pipefail

     

       14
       14
        
       

     

       15
       15
        
           file=/var/lib/hddtemp/hddtemp.db

     

       16
       16
        
       

     

       17
       17
       -
           drives=(${toString (map (e: ''$(realpath ${lib.escapeShellArg e}) '') cfg.drives)})

     

       17
       17
       +
           raw_drives=""

     

       18
       18
       +
           ${lib.concatStringsSep "\n" (map (drives: "raw_drives+=\"${drives} \"") cfg.drives)}

     

       19
       19
       +
           drives=""

     

       20
       20
       +
           for i in $raw_drives; do

     

       21
       21
       +
             drives+=" $(realpath $i)"

     

       22
       22
       +
           done

     

       18
       23
        
       

     

       19
       24
        
           cp ${pkgs.hddtemp}/share/hddtemp/hddtemp.db $file

     

       20
       25
        
           ${lib.concatMapStringsSep "\n" (e: "echo ${lib.escapeShellArg e} >> $file") cfg.dbEntries}

     

       21
       26
        
       

     

       22
       22
       -
           exec ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \

     

       27
       27
       +
           ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \

     

       23
       28
        
             --daemon \

     

       24
       29
        
             --unit=${cfg.unit} \

     

       25
       30
        
             --file=$file \

     

       26
       26
       -
             ''${drives[@]}

     

       31
       31
       +
             $drives

     

       27
       32
        
         '';

     

       28
       33
        
       

     

       29
       34
        
       in

     
···

       77
       82
        
             description = "HDD/SSD temperature";

     

       78
       83
        
             documentation = [ "man:hddtemp(8)" ];

     

       79
       84
        
             wantedBy = [ "multi-user.target" ];

     

       85
       85
       +
             inherit script;

     

       80
       86
        
             serviceConfig = {

     

       81
       87
        
               Type = "forking";

     

       82
       82
       -
               ExecStart = wrapper;

     

       83
       88
        
               StateDirectory = "hddtemp";

     

       84
       89
        
               PrivateTmp = true;

     

       85
       90
        
               ProtectHome = "tmpfs";

+18 -6

nixos/modules/services/hardware/hddfancontrol.nix

···

       52
       52
        
                   {

     

       53
       53
        
                     options = {

     

       54
       54
        
                       disks = lib.mkOption {

     

       55
       55
       -
                         type = lib.types.listOf lib.types.path;

     

       55
       55
       +
                         type = lib.types.listOf lib.types.str;

     

       56
       56
        
                         default = [ ];

     

       57
       57
        
                         description = ''

     

       58
       58
        
                           Drive(s) to get temperature from

     

       59
       59
       +
       

     

       60
       60
       +
                           Can also use command substitution to automatically grab all matching drives; such as all scsi (sas) drives

     

       59
       61
        
                         '';

     

       60
       60
       -
                         example = [ "/dev/sda" ];

     

       62
       62
       +
                         example = [

     

       63
       63
       +
                           "/dev/sda"

     

       64
       64
       +
                           "`find /dev/disk/by-id -name \"scsi*\" -and -not -name \"*-part*\" -printf \"%p \"`"

     

       65
       65
       +
                         ];

     

       61
       66
        
                       };

     

       62
       67
        
       

     

       63
       68
        
                       pwmPaths = lib.mkOption {

     

       64
       64
       -
                         type = lib.types.listOf lib.types.path;

     

       69
       69
       +
                         type = lib.types.listOf lib.types.str;

     

       65
       70
        
                         default = [ ];

     

       66
       71
        
                         description = ''

     

       67
       72
        
                           PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values

     

       73
       73
       +
                           Can also use command substitution to ensure the correct hwmonX is selected on every boot

     

       68
       74
        
                         '';

     

       69
       69
       -
                         example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ];

     

       75
       75
       +
                         example = [

     

       76
       76
       +
                           "/sys/class/hwmon/hwmon2/pwm1:30:10"

     

       77
       77
       +
                           "`echo /sys/devices/platform/nct6775.656/hwmon/hwmon[[:print:]]`/pwm4:80:20"

     

       78
       78
       +
                         ];

     

       70
       79
        
                       };

     

       71
       80
        
       

     

       72
       81
        
                       logVerbosity = lib.mkOption {

     
···

       151
       160
        
               documentation = [ "man:hddfancontrol(1)" ];

     

       152
       161
        
               after = [ "hddtemp.service" ];

     

       153
       162
        
               wants = [ "hddtemp.service" ];

     

       163
       163
       +
               script =

     

       164
       164
       +
                 let

     

       165
       165
       +
                   argString = lib.strings.concatStringsSep " " (args cnf);

     

       166
       166
       +
                 in

     

       167
       167
       +
                 "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${argString}";

     

       154
       168
        
               serviceConfig = {

     

       155
       155
       -
                 ExecStart = "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${lib.escapeShellArgs (args cnf)}";

     

       156
       156
       -
       

     

       157
       169
        
                 CPUSchedulingPolicy = "rr";

     

       158
       170
        
                 CPUSchedulingPriority = 49;

     

       159
       171