treewide/nixos: remove with lib; part 6

nixos/modules/installer/netboot/netboot-base.nix

@@ -1,10 +1,6 @@
 # This module contains the basic configuration for building netboot
 # images
-
 { lib, ... }:
-
-with lib;
-
 {
   imports =
     [ ./netboot.nix

nixos/modules/installer/netboot/netboot.nix

@@ -1,14 +1,10 @@
 # This module creates netboot media containing the given NixOS
 # configuration.
-
 { config, lib, pkgs, ... }:
-
-with lib;
-
 {
   options = {
 
-    netboot.squashfsCompression = mkOption {
+    netboot.squashfsCompression = lib.mkOption {
       default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% "
                 + lib.optionalString isx86 "-Xbcj x86"
                 # Untested but should also reduce size for these platforms
@@ -19,11 +15,11 @@ with lib;
         Compression settings to use for the squashfs nix store.
       '';
       example = "zstd -Xcompression-level 6";
-      type = types.str;
+      type = lib.types.str;
     };
 
-    netboot.storeContents = mkOption {
-      example = literalExpression "[ pkgs.stdenv ]";
+    netboot.storeContents = lib.mkOption {
+      example = lib.literalExpression "[ pkgs.stdenv ]";
       description = ''
         This option lists additional derivations to be included in the
         Nix store in the generated netboot image.
@@ -37,27 +33,27 @@ with lib;
     # here and it causes a cyclic dependency.
     boot.loader.grub.enable = false;
 
-    fileSystems."/" = mkImageMediaOverride
+    fileSystems."/" = lib.mkImageMediaOverride
       { fsType = "tmpfs";
         options = [ "mode=0755" ];
       };
 
     # In stage 1, mount a tmpfs on top of /nix/store (the squashfs
     # image) to make this a live CD.
-    fileSystems."/nix/.ro-store" = mkImageMediaOverride
+    fileSystems."/nix/.ro-store" = lib.mkImageMediaOverride
       { fsType = "squashfs";
         device = "../nix-store.squashfs";
         options = [ "loop" ];
         neededForBoot = true;
       };
 
-    fileSystems."/nix/.rw-store" = mkImageMediaOverride
+    fileSystems."/nix/.rw-store" = lib.mkImageMediaOverride
       { fsType = "tmpfs";
         options = [ "mode=0755" ];
         neededForBoot = true;
       };
 
-    fileSystems."/nix/store" = mkImageMediaOverride
+    fileSystems."/nix/store" = lib.mkImageMediaOverride
       { overlay = {
           lowerdir = [ "/nix/.ro-store" ];
           upperdir = "/nix/.rw-store/store";

nixos/modules/profiles/headless.nix

@@ -1,10 +1,6 @@
 # Common configuration for headless machines (e.g., Amazon EC2
 # instances).
-
 { lib, ... }:
-
-with lib;
-
 {
   # Don't start a tty on the serial consoles.
   systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false;

nixos/modules/profiles/installation-device.nix

@@ -1,8 +1,5 @@
 # Provide a basic configuration for installation devices like CDs.
 { config, pkgs, lib, ... }:
-
-with lib;
-
 {
   imports =
     [ # Enable devices which are usually scanned, because we don't know the
@@ -23,10 +20,10 @@ with lib;
     system.nixos.variant_id = lib.mkDefault "installer";
 
     # Enable in installer, even if the minimal profile disables it.
-    documentation.enable = mkImageMediaOverride true;
+    documentation.enable = lib.mkImageMediaOverride true;
 
     # Show the manual.
-    documentation.nixos.enable = mkImageMediaOverride true;
+    documentation.nixos.enable = lib.mkImageMediaOverride true;
 
     # Use less privileged nixos user
     users.users.nixos = {
@@ -44,8 +41,8 @@ with lib;
 
     # Allow passwordless sudo from nixos user
     security.sudo = {
-      enable = mkDefault true;
-      wheelNeedsPassword = mkImageMediaOverride false;
+      enable = lib.mkDefault true;
+      wheelNeedsPassword = lib.mkImageMediaOverride false;
     };
 
     # Automatically log in at the virtual consoles.
@@ -62,7 +59,7 @@ with lib;
       If you need a wireless connection, type
       `sudo systemctl start wpa_supplicant` and configure a
       network using `wpa_cli`. See the NixOS manual for details.
-    '' + optionalString config.services.xserver.enable ''
+    '' + lib.optionalString config.services.xserver.enable ''
 
       Type `sudo systemctl start display-manager' to
       start the graphical user interface.
@@ -79,9 +76,9 @@ with lib;
     };
 
     # Enable wpa_supplicant, but don't start it by default.
-    networking.wireless.enable = mkDefault true;
+    networking.wireless.enable = lib.mkDefault true;
     networking.wireless.userControlled.enable = true;
-    systemd.services.wpa_supplicant.wantedBy = mkOverride 50 [];
+    systemd.services.wpa_supplicant.wantedBy = lib.mkOverride 50 [];
 
     # Tell the Nix evaluator to garbage collect more aggressively.
     # This is desirable in memory-constrained environments that don't
@@ -114,7 +111,7 @@ with lib;
     # Show all debug messages from the kernel but don't log refused packets
     # because we have the firewall enabled. This makes installs from the
     # console less cumbersome if the machine has a public IP.
-    networking.firewall.logRefusedConnections = mkDefault false;
+    networking.firewall.logRefusedConnections = lib.mkDefault false;
 
     # Prevent installation media from evacuating persistent storage, as their
     # var directory is not persistent and it would thus result in deletion of

nixos/modules/security/rtkit.nix

@@ -1,16 +1,12 @@
 # A module for ‘rtkit’, a DBus system service that hands out realtime
 # scheduling priority to processes that ask for it.
-
 { config, lib, pkgs, ... }:
-
-with lib;
-
 {
 
   options = {
 
-    security.rtkit.enable = mkOption {
-      type = types.bool;
+    security.rtkit.enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Whether to enable the RealtimeKit system service, which hands
@@ -23,7 +19,7 @@ with lib;
   };
 
 
-  config = mkIf config.security.rtkit.enable {
+  config = lib.mkIf config.security.rtkit.enable {
 
     security.polkit.enable = true;