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/mount/default.nix

@@ -2,53 +2,74 @@
 ##
 ## Mount filesystems
 
-
-{ lib, pkgs, config, ...}:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 let
   inherit (lib) mkOption types;
   inherit (pkgs) liminix;
 
-in {
+in
+{
   options = {
     system.service.mount = mkOption {
       type = liminix.lib.types.serviceDefn;
     };
   };
-  imports = [ ../mdevd.nix ../uevent-rule ];
+  imports = [
+    ../mdevd.nix
+    ../uevent-rule
+  ];
   config.system.service.mount =
-    let svc = config.system.callService ./service.nix {
-          partlabel = mkOption {
-            type = types.str;
-            example = "my-usb-stick";
-          };
-          mountpoint = mkOption {
-            type = types.str;
-            example = "/mnt/media";
-          };
-          options = mkOption {
-            type = types.listOf types.str;
-            default = [];
-            example = ["noatime" "ro" "sync"];
-          };
-          fstype = mkOption {
-            type = types.str;
-            default = "auto";
-            example = "vfat";
-          };
+    let
+      svc = config.system.callService ./service.nix {
+        partlabel = mkOption {
+          type = types.str;
+          example = "my-usb-stick";
         };
-    in svc // {
-      build = args:
-        let args' = args // {
-              dependencies = (args.dependencies or []) ++ [
-                config.services.mdevd
-                config.services.devout
-              ];
-            };
-        in svc.build args' ;
+        mountpoint = mkOption {
+          type = types.str;
+          example = "/mnt/media";
+        };
+        options = mkOption {
+          type = types.listOf types.str;
+          default = [ ];
+          example = [
+            "noatime"
+            "ro"
+            "sync"
+          ];
+        };
+        fstype = mkOption {
+          type = types.str;
+          default = "auto";
+          example = "vfat";
+        };
+      };
+    in
+    svc
+    // {
+      build =
+        args:
+        let
+          args' = args // {
+            dependencies = (args.dependencies or [ ]) ++ [
+              config.services.mdevd
+              config.services.devout
+            ];
+          };
+        in
+        svc.build args';
     };
 
-  config.programs.busybox  = {
-    applets = ["blkid" "findfs"];
+  config.programs.busybox = {
+    applets = [
+      "blkid"
+      "findfs"
+    ];
     options = {
       FEATURE_BLKID_TYPE = "y";
       FEATURE_MOUNT_FLAGS = "y";

modules/mount/service.nix

@@ -1,15 +1,19 @@
 {
-  liminix
-, lib
-, svc
+  liminix,
+  lib,
+  svc,
+}:
+{
+  partlabel,
+  mountpoint,
+  options,
+  fstype,
 }:
-{ partlabel, mountpoint, options, fstype }:
 let
   inherit (liminix.services) oneshot;
   device = "/dev/disk/by-partlabel/${partlabel}";
   name = "mount.${lib.strings.sanitizeDerivationName (lib.escapeURL mountpoint)}";
-  options_string =
-    if options == [] then "" else "-o ${lib.concatStringsSep "," options}";
+  options_string = if options == [ ] then "" else "-o ${lib.concatStringsSep "," options}";
   controller = svc.uevent-rule.build {
     serviceName = name;
     symlink = device;
@@ -18,7 +22,8 @@ let
       devtype = "partition";
     };
   };
-in oneshot {
+in
+oneshot {
   inherit name;
   timeout-up = 3600;
   up = "mount -t ${fstype} ${options_string} ${device} ${mountpoint}";