Remove uses of "with lib;"

Avoids a Nix "anti-pattern"

Author: danielfullmer

default.nix

@@ -6,9 +6,10 @@
   lib ? pkgs.stdenv.lib
 }:
 
-with lib;
 let
-  eval = (evalModules {
+  inherit (lib) mkOption types;
+
+  eval = (lib.evalModules {
     modules = [
       ({ config, ... }: {
         options.nixpkgs.overlays = mkOption {

example.nix

@@ -6,9 +6,6 @@
 
 { config, pkgs, lib, ... }:
 
-with pkgs;
-with lib;
-
 let
   myDomain = "daniel.fullmer.me";
 in
@@ -41,7 +38,7 @@ in
   };
 
   # Custom hosts file
-  hosts = fetchurl { # 2019-08-14
+  hosts = pkgs.fetchurl { # 2019-08-14
     url = "https://raw.githubusercontent.com/StevenBlack/hosts/449a0d7f613e6518ede4f3333e94f8071d3f1cd3/hosts";
     sha256 = "1mcn77l2m45qms7ynww2hzx0d6mja03bzj4di0s9j7spycp4540i";
   };

flavors/grapheneos/default.nix

@@ -2,8 +2,11 @@
 # SPDX-License-Identifier: MIT
 
 { config, pkgs, lib, ... }:
-with lib;
 let
+  inherit (lib)
+    optional optionalString optionalAttrs elem
+    mkIf mkMerge mkDefault mkForce;
+
   grapheneOSRelease = "${config.apv.buildID}.2021.04.22.20";
 
   phoneDeviceFamilies = [ "crosshatch" "bonito" "coral" "sunfish" "redfin" ];

flavors/lineageos/default.nix

@@ -2,10 +2,16 @@
 # SPDX-License-Identifier: MIT
 
 { config, pkgs, lib, ... }:
-with lib;
 let
+  inherit (lib)
+    optional optionals optionalString optionalAttrs
+    elem mapAttrs mapAttrs' nameValuePair filterAttrs
+    attrNames getAttrs flatten remove
+    mkIf mkMerge mkDefault mkForce
+    importJSON toLower;
+
   LineageOSRelease = "lineage-17.1";
-  repoDirs = lib.importJSON (./. + "/repo-${LineageOSRelease}.json");
+  repoDirs = importJSON (./. + "/repo-${LineageOSRelease}.json");
   deviceMetadata = importJSON ./device-metadata.json;
   _deviceDirs = importJSON ./device-dirs.json;
   vendorDirs = importJSON ./vendor-dirs.json;

flavors/vanilla/default.nix

@@ -2,10 +2,12 @@
 # SPDX-License-Identifier: MIT
 
 { config, pkgs, lib, ... }:
-with lib;
 let
-  # https://source.android.com/setup/start/build-numbers
+  inherit (lib)
+    optional optionalString optionalAttrs elem
+    mkIf mkMerge mkDefault;
 
+  # https://source.android.com/setup/start/build-numbers
   phoneDeviceFamilies =
     (optional (config.androidVersion <= 10) "marlin")
     ++ [ "taimen" "muskie" "crosshatch" "bonito" "coral" "sunfish" "redfin" ];
@@ -203,7 +205,7 @@ in mkIf (config.flavor == "vanilla") (mkMerge [
       "arch/arm64/boot/dts/vendor/qcom/display" = fetchRepo "private/msm-google/arch/arm64/boot/dts/vendor/qcom/display";
     };
   in pkgs.runCommand "kernel-src" {}
-    (concatStringsSep "\n" (lib.mapAttrsToList (relpath: repo: ''
+    (lib.concatStringsSep "\n" (lib.mapAttrsToList (relpath: repo: ''
       ${lib.optionalString (relpath != "") "mkdir -p $out/$(dirname ${relpath})"}
       cp -r ${repo} $out/${relpath}
       chmod u+w -R $out/${relpath}

lib/default.nix

@@ -3,34 +3,33 @@
 
 lib:
 
-with lib; # Android stuff that might come in handy across multiple modules, profiles, etc
 rec {
   # Guess resource type. Should normally work fine, but can't detect color/dimension types
   resourceTypeName = r:
-    if isBool r then "bool"
-    else if isInt r then "integer"
-    else if isString r then "string"
-    else if isList r then
-      (assert (length r != 0); # Cannot autodetect type of empty list
-       if isInt (head r) then "integer-array"
-       else if isString (head r) then "string-array"
+    if lib.isBool r then "bool"
+    else if lib.isInt r then "integer"
+    else if lib.isString r then "string"
+    else if lib.isList r then
+      (assert (lib.length r != 0); # Cannot autodetect type of empty list
+       if lib.isInt (lib.head r) then "integer-array"
+       else if lib.isString (lib.head r) then "string-array"
        else assert false; "Unknown type"
       )
     else assert false; "Unknown type";
   resourceValueXML = value: type: {
-    bool = boolToString value;
+    bool = lib.boolToString value;
     color = value; # define our own specialized type for these?
     dimension = value;
     integer = toString value;
     string = value;
-    integer-array = concatMapStringsSep "" (i: "<item>${toString i}</item>") value;
-    string-array = concatMapStringsSep "" (i: "<item>${i}</item>") value;
+    integer-array = lib.concatMapStringsSep "" (i: "<item>${toString i}</item>") value;
+    string-array = lib.concatMapStringsSep "" (i: "<item>${i}</item>") value;
     # Ignoring other typed arrays for now
   }.${type};
 
   resourceXML = name: value: let
     resourceXMLEntity = name: value: type: ''<${type} name="${name}">${resourceValueXML value type}</${type}>'';
-  in if isAttrs value then
+  in if lib.isAttrs value then
       # Submodule with manually specified resource type
       resourceXMLEntity name value.value value.type
     else
@@ -40,7 +39,7 @@ rec {
   configXML = resources: ''
     <?xml version="1.0" encoding="utf-8"?>
     <resources>
-      ${concatStringsSep "\n" (mapAttrsToList resourceXML resources)}
+      ${lib.concatStringsSep "\n" (lib.mapAttrsToList resourceXML resources)}
     </resources>
   '';
 

modules/10/default.nix

@@ -3,8 +3,9 @@
 
 { config, pkgs, lib, ... }:
 
-with lib;
 let
+  inherit (lib) mkIf mkDefault;
+
   # Some mostly-unique data used as input for filesystem UUIDs, hash_seeds, and AVB salt.
   # TODO: Maybe include all source hashes except from build/make to avoid infinite recursion?
   hash = builtins.hashString "sha256" "${config.buildNumber} ${builtins.toString config.buildDateTime}";
@@ -15,7 +16,7 @@ mkIf (config.androidVersion == 10) {
   source.dirs."build/make" = {
     patches = [
       ./build_make/0001-Readonly-source-fix.patch
-    ] ++ (optional (config.flavor != "lineageos")
+    ] ++ (lib.optional (config.flavor != "lineageos")
       (pkgs.substituteAll {
         src = ./build_make/0002-Partition-size-fix.patch;
         inherit (pkgs) coreutils;

modules/11/default.nix

@@ -3,8 +3,9 @@
 
 { config, pkgs, lib, ... }:
 
-with lib;
 let
+  inherit (lib) mkIf mkDefault;
+
   # Some mostly-unique data used as input for filesystem UUIDs, hash_seeds, and AVB salt.
   # TODO: Maybe include all source hashes except from build/make to avoid infinite recursion?
   hash = builtins.hashString "sha256" "${config.buildNumber} ${builtins.toString config.buildDateTime}";
@@ -15,7 +16,7 @@ mkIf (config.androidVersion == 11) {
   source.dirs."build/make" = {
     patches = [
       ./build_make/0001-Readonly-source-fix.patch
-    ] ++ (optional (!(elem config.flavor [ "grapheneos" "lineageos" ]))
+    ] ++ (lib.optional (!(lib.elem config.flavor [ "grapheneos" "lineageos" ]))
       (pkgs.substituteAll {
         src = ./build_make/0002-Partition-size-fix.patch;
         inherit (pkgs) coreutils;

modules/12/default.nix

@@ -3,8 +3,9 @@
 
 { config, pkgs, lib, ... }:
 
-with lib;
-
+let
+  inherit (lib) mkIf;
+in
 mkIf (config.androidVersion == 12) {
   apiLevel = 31;
 

modules/9/default.nix

@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: MIT
 { config, pkgs, lib, ... }:
 
-with lib;
 let
+  inherit (lib) mkIf mkDefault;
+
   flex = pkgs.callPackage ./flex-2.5.39.nix {};
 in
 mkIf (config.androidVersion == 9) {