fix inconsistent indentation with nixpkgs-fmt

default.nix

@@ -4,7 +4,8 @@ with builtins;
 
 let
 
-  helper.find-device = device: let
+  helper.find-device = device:
+    let
       environment = helper.device-id device;
     in
     # DEVICE points already to /dev/disk, so we don't handle it via /dev/disk/by-path
@@ -46,7 +47,7 @@ let
   };
 
   config.devices = q: x:
-    foldl' recursiveUpdate {} (mapAttrsToList (name: config-f { device = "/dev/${name}"; }) x.content);
+    foldl' recursiveUpdate { } (mapAttrsToList (name: config-f { device = "/dev/${name}"; }) x.content);
 
   config.luks = q: x: {
     boot.initrd.luks.devices.${x.name}.device = q.device;
@@ -56,15 +57,15 @@ let
     config-f { device = "/dev/${q.vgname}/${q.name}"; } x.content;
 
   config.lvm_vg = q: x:
-    foldl' recursiveUpdate {} (mapAttrsToList (name: config-f { inherit name; vgname = x.name; }) x.lvs);
+    foldl' recursiveUpdate { } (mapAttrsToList (name: config-f { inherit name; vgname = x.name; }) x.lvs);
 
-  config.noop = q: x: {};
+  config.noop = q: x: { };
 
   config.partition = q: x:
     config-f { device = q.device + toString q.index; } x.content;
 
   config.table = q: x:
-    foldl' recursiveUpdate {} (imap (index: config-f (q // { inherit index; })) x.partitions);
+    foldl' recursiveUpdate { } (imap (index: config-f (q // { inherit index; })) x.partitions);
 
 
   create-f = q: x: create.${x.type} q x;
@@ -87,10 +88,12 @@ let
       ${q.device}
   '';
 
-  create.devices = q: x: let
+  create.devices = q: x:
+    let
       raid-devices = lib.filterAttrs (_: dev: dev.type == "mdadm" || dev.type == "zpool" || dev.type == "lvm_vg") x.content;
       other-devices = lib.filterAttrs (_: dev: dev.type != "mdadm" && dev.type != "zpool" && dev.type != "lvm_vg") x.content;
-  in ''
+    in
+    ''
       ${concatStrings (mapAttrsToList (name: create-f { device = "/dev/${name}"; }) other-devices)}
       ${concatStrings (mapAttrsToList (name: create-f { device = "/dev/${name}"; name = name; }) raid-devices)}
     '';
@@ -134,9 +137,11 @@ let
 
   create.noop = q: x: "";
 
-  create.partition = q: x: let
+  create.partition = q: x:
+    let
       env = helper.device-id q.device;
-  in ''
+    in
+    ''
       parted -s "''${${env}}" mkpart ${x.part-type} ${x.fs-type or ""} ${x.start} ${x.end}
       # ensure /dev/disk/by-path/..-partN exists before continuing
       udevadm trigger --subsystem-match=block; udevadm settle
@@ -194,11 +199,13 @@ let
 
   mount.btrfs = mount.filesystem;
 
-  mount.devices = q: x: let
+  mount.devices = q: x:
-    z = foldl' recursiveUpdate {} (mapAttrsToList (name: mount-f { device = "/dev/${name}"; inherit name; }) x.content);
+    let
+      z = foldl' recursiveUpdate { } (mapAttrsToList (name: mount-f { device = "/dev/${name}"; inherit name; }) x.content);
       # attrValues returns values sorted by name.  This is important, because it
       # ensures that "/" is processed before "/foo" etc.
-  in ''
+    in
+    ''
       ${optionalString (hasAttr "table" z) (concatStringsSep "\n" (attrValues z.table))}
       ${optionalString (hasAttr "luks" z) (concatStringsSep "\n" (attrValues z.luks))}
       ${optionalString (hasAttr "lvm" z) (concatStringsSep "\n" (attrValues z.lvm))}
@@ -210,9 +217,11 @@ let
   mount.luks = q: x: (
     recursiveUpdate
       (mount-f { device = "/dev/mapper/${x.name}"; } x.content)
-    {luks.${q.device} = ''
+      {
+        luks.${q.device} = ''
           cryptsetup status ${x.name} >/dev/null 2>/dev/null || cryptsetup luksOpen ${q.device} ${x.name} ${if builtins.hasAttr "keyfile" x then "--key-file " + x.keyfile else ""}
-    '';}
+        '';
+      }
   );
 
   mount.lvm_lv = q: x:
@@ -220,15 +229,17 @@ let
 
   mount.lvm_vg = q: x: (
     recursiveUpdate
-    (foldl' recursiveUpdate {} (mapAttrsToList (name: mount-f { inherit name; vgname = q.name; }) x.lvs))
+      (foldl' recursiveUpdate { } (mapAttrsToList (name: mount-f { inherit name; vgname = q.name; }) x.lvs))
-    {lvm.${q.device} = ''
+      {
+        lvm.${q.device} = ''
           vgchange -a y
-    '';}
+        '';
+      }
   );
 
   mount.lvm_pv = mount.noop;
 
-  mount.noop = q: x: {};
+  mount.noop = q: x: { };
 
   mount.mdadm = q: x:
     mount-f { device = "/dev/md/${q.name}"; } x.content;
@@ -239,18 +250,20 @@ let
 
   mount.table = q: x: (
     recursiveUpdate
-    (foldl' recursiveUpdate {} (imap (index: mount-f (q // { inherit index; device = helper.device-id q.device; })) x.partitions))
+      (foldl' recursiveUpdate { } (imap (index: mount-f (q // { inherit index; device = helper.device-id q.device; })) x.partitions))
-    {table.${q.device} = helper.find-device q.device;}
+      { table.${q.device} = helper.find-device q.device; }
   );
 
   mount.zfs = mount.noop;
 
   mount.zpool = q: x: (
     recursiveUpdate
-    (foldl' recursiveUpdate {} (map (mount-f (q // { pool = q.name; })) x.datasets))
+      (foldl' recursiveUpdate { } (map (mount-f (q // { pool = q.name; })) x.datasets))
-    {zpool.${q.device} = ''
+      {
+        zpool.${q.device} = ''
           zpool list '${q.name}' >/dev/null 2>/dev/null || zpool import '${q.name}'
-    '';}
+        '';
+      }
   );
 
   mount.zfs_filesystem = q: x: {
@@ -267,8 +280,9 @@ let
   mount.zfs_volume = q: x:
     mount-f { device = "/dev/zvol/${q.pool}/${x.name}"; } x.content;
 
-in {
+in
-  config = config-f {};
+{
+  config = config-f { };
   create = cfg: ''
     set -efux
     ${create-f {} cfg}

tests/btrfs-subvolumes.nix

@@ -1,5 +1,5 @@
-{ pkgs ? (import <nixpkgs> {})
+{ pkgs ? (import <nixpkgs> { })
-, makeDiskoTest ? (pkgs.callPackage ./lib.nix {}).makeDiskoTest
+, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
   disko-config = import ../example/btrfs-subvolumes.nix;

tests/default.nix

@@ -1,5 +1,5 @@
 { makeTest ? import <nixpkgs/nixos/tests/make-test-python.nix>
-, pkgs ? (import <nixpkgs> {})
+, pkgs ? (import <nixpkgs> { })
 }@args:
 let
   lib = pkgs.lib;
@@ -12,4 +12,5 @@ let
     );
 
   allTests = lib.genAttrs (allTestFilenames) (test: import (./. + "/${test}.nix") { inherit makeDiskoTest; });
-in allTests
+in
+allTests

tests/lib.nix

@@ -1,12 +1,12 @@
-{ pkgs ? (import <nixpkgs> {})
+{ pkgs ? (import <nixpkgs> { })
 , makeTest ? import <nixpkgs/nixos/tests/make-test-python.nix>
 , ...
 }:
 {
-  makeDiskoTest = {
+  makeDiskoTest =
-    disko-config,
+    { disko-config
-    extraTestScript,
+    , extraTestScript
-    extraConfig ? {}
+    , extraConfig ? { }
     }:
     let
       lib = pkgs.lib;
@@ -15,10 +15,11 @@
           inherit pkgs;
           inherit (pkgs) system;
         };
-    tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. {}).create disko-config);
+      tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create disko-config);
-    tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. {}).mount disko-config);
+      tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount disko-config);
-    num-disks = builtins.length (builtins.filter (x: builtins.match "vd." x == []) (lib.attrNames disko-config.content));
+      num-disks = builtins.length (builtins.filter (x: builtins.match "vd." x == [ ]) (lib.attrNames disko-config.content));
-  in makeTest' {
+    in
+    makeTest' {
       name = "disko";
 
       nodes.machine =

tests/luks-lvm.nix

@@ -1,5 +1,5 @@
-{ pkgs ? (import <nixpkgs> {})
+{ pkgs ? (import <nixpkgs> { })
-, makeDiskoTest ? (pkgs.callPackage ./lib.nix {}).makeDiskoTest
+, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
   disko-config = import ../example/luks-lvm.nix;

tests/lvm-raid.nix

@@ -1,5 +1,5 @@
-{ pkgs ? (import <nixpkgs> {})
+{ pkgs ? (import <nixpkgs> { })
-, makeDiskoTest ? (pkgs.callPackage ./lib.nix {}).makeDiskoTest
+, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
   disko-config = import ../example/lvm-raid.nix;

tests/mdadm.nix

@@ -1,5 +1,5 @@
-{ pkgs ? (import <nixpkgs> {})
+{ pkgs ? (import <nixpkgs> { })
-, makeDiskoTest ? (pkgs.callPackage ./lib.nix {}).makeDiskoTest
+, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
   disko-config = import ../example/mdadm.nix;

tests/zfs.nix

@@ -1,5 +1,5 @@
-{ pkgs ? (import <nixpkgs> {})
+{ pkgs ? (import <nixpkgs> { })
-, makeDiskoTest ? (pkgs.callPackage ./lib.nix {}).makeDiskoTest
+, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
 }:
 makeDiskoTest {
   disko-config = import ../example/zfs.nix;