Merge remote-tracking branch 'origin/master' into staging-next

nixos/modules/profiles/headless.nix

@@ -3,8 +3,6 @@
 
 { lib, ... }:
 
-with lib;
-
 {
   # Don't start a tty on the serial consoles.
   systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false;

nixos/modules/profiles/nix-builder-vm.nix

@@ -212,18 +212,18 @@ in
           ''
         );
 
-        run-builder = hostPkgs.writeShellScriptBin "run-builder" (''
+        run-builder = hostPkgs.writeShellScriptBin "run-builder" ''
           set -euo pipefail
           KEYS="''${KEYS:-./keys}"
           KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm}
-        '');
+        '';
 
-        script = hostPkgs.writeShellScriptBin "create-builder" (''
+        script = hostPkgs.writeShellScriptBin "create-builder" ''
           set -euo pipefail
           export KEYS="''${KEYS:-./keys}"
           ${lib.getExe add-keys}
           ${lib.getExe run-builder}
-        '');
+        '';
 
       in
       script.overrideAttrs (old: {