nixfmt-rfc-style

There is nothing in this commit except for the changes made by
nix-shell -p nixfmt-rfc-style --run "nixfmt ."

If this has mucked up your open branches then sorry about that. You
can probably nixfmt them to match before merging

modules/health-check/default.nix

@@ -6,13 +6,18 @@
 ## have other behaviours by e.g. combining this service with a round-robin
 ## for failover)
 
-
-{ lib, pkgs, config, ...}:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 let
   inherit (lib) mkOption types;
   inherit (pkgs) liminix;
+in
 #  inherit (pkgs.liminix.services) longrun;
-in {
+{
   options = {
     system.service.health-check = mkOption {
       description = "run a service while periodically checking it is healthy";
@@ -23,13 +28,13 @@ in {
     service = mkOption {
       type = liminix.lib.types.service;
     };
-    interval =  mkOption {
+    interval = mkOption {
       description = "interval between checks, in seconds";
       type = types.int;
       default = 10;
       example = 10;
     };
-    threshold =  mkOption {
+    threshold = mkOption {
       description = "number of consecutive failures required for the service to be kicked";
       type = types.int;
       example = 3;
@@ -39,5 +44,5 @@ in {
       type = types.path;
     };
   };
-  config.programs.busybox.applets = ["expr"];
+  config.programs.busybox.applets = [ "expr" ];
 }

modules/health-check/service.nix

@@ -1,37 +1,50 @@
 {
-  liminix, lib, lim, s6
+  liminix,
+  lib,
+  lim,
+  s6,
+}:
+{
+  service,
+  interval,
+  threshold,
+  healthCheck,
 }:
-{ service, interval, threshold, healthCheck } :
 let
   inherit (liminix.services) oneshot longrun;
   inherit (builtins) toString;
   inherit (service) name;
-  checker = let name' = "check-${name}"; in longrun {
-    name = name';
-    run = ''
-      fails=0
-      echo waiting for /run/service/${name}
-      ${s6}/bin/s6-svwait -U /run/service/${name} || exit
-      while sleep ${toString interval} ; do
-        ${healthCheck}
-        if test $? -gt 0; then
-          fails=$(expr $fails + 1)
-        else
-          fails=0
-        fi
-        echo fails $fails/${toString threshold} for ${name}
-        if test "$fails" -gt "${toString threshold}" ; then
-          echo time to die
-          ${s6}/bin/s6-svc -r /run/service/${name}
-          echo bounced
-          fails=0
-          echo waiting for /run/service/${name}
-          ${s6}/bin/s6-svwait -U /run/service/${name}
-        fi
-      done
-    '';
-  };
-in service.overrideAttrs(o: {
-  buildInputs =  (lim.orEmpty o.buildInputs) ++ [ checker ];
+  checker =
+    let
+      name' = "check-${name}";
+    in
+    longrun {
+      name = name';
+      run = ''
+        fails=0
+        echo waiting for /run/service/${name}
+        ${s6}/bin/s6-svwait -U /run/service/${name} || exit
+        while sleep ${toString interval} ; do
+          ${healthCheck}
+          if test $? -gt 0; then
+            fails=$(expr $fails + 1)
+          else
+            fails=0
+          fi
+          echo fails $fails/${toString threshold} for ${name}
+          if test "$fails" -gt "${toString threshold}" ; then
+            echo time to die
+            ${s6}/bin/s6-svc -r /run/service/${name}
+            echo bounced
+            fails=0
+            echo waiting for /run/service/${name}
+            ${s6}/bin/s6-svwait -U /run/service/${name}
+          fi
+        done
+      '';
+    };
+in
+service.overrideAttrs (o: {
+  buildInputs = (lim.orEmpty o.buildInputs) ++ [ checker ];
   dependencies = (lim.orEmpty o.dependencies) ++ [ checker ];
 })