diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2023-08-01 19:18:48 -0400 |
---|---|---|
committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2023-08-01 19:18:48 -0400 |
commit | 1d416595adfc7d48ef06ee49ffd2d9efee2c8859 (patch) | |
tree | 369295ba361399ad1983e3c127b39ee07d4b7a6c /nixos/modules/system/boot | |
parent | c867c6d17288a604d08e313092d0db7c19f11d60 (diff) |
nixos/grub: Remove `with` with broad scopes.
There is only other `with` with a somewhat broad scope, `with pkgs`, but it's used in a place where it would become awkward to change out. And anyway its scope is rather limited still.
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 120e7f3315347..468f701ae5bc7 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -1,8 +1,32 @@ { config, options, lib, pkgs, ... }: -with lib; - let + inherit (lib) + all + concatMap + concatMapStrings + concatStrings + concatStringsSep + escapeShellArg + flip + foldr + forEach + hasPrefix + mapAttrsToList + literalExpression + makeBinPath + mkDefault + mkIf + mkMerge + mkOption + mkRemovedOptionModule + mkRenamedOptionModule + optional + optionals + optionalString + replaceStrings + types + ; cfg = config.boot.loader.grub; @@ -150,7 +174,7 @@ in (as opposed to external files) will be copied into the Nix store, and will be visible to all local users. ''; - type = with types; attrsOf (submodule { + type = types.attrsOf (types.submodule { options = { hashedPasswordFile = mkOption { example = "/path/to/file"; |