treewide: remove redundant 'builtins'
I keep forgetting `map` and `removeAttrs` are included at the top-level in the prelude.
This commit is contained in:
parent
7231c7ced7
commit
34c4f044a2
6 changed files with 8 additions and 8 deletions
|
|
@ -11,7 +11,7 @@ let
|
|||
lib.mkDefault [ (lib.getExe pkgs.ambroisie.rbw-pass) "Mail" passName ];
|
||||
|
||||
address = mkMailAddress address domain;
|
||||
aliases = builtins.map (lib.flip mkMailAddress domain) aliases;
|
||||
aliases = map (lib.flip mkMailAddress domain) aliases;
|
||||
|
||||
inherit primary;
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ in
|
|||
inactive_state = "Idle";
|
||||
};
|
||||
in
|
||||
builtins.map (block: defaults // block) cfg.vpn.blockConfigs
|
||||
map (block: defaults // block) cfg.vpn.blockConfigs
|
||||
)
|
||||
)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ in
|
|||
enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = builtins.map lib.hiPrio [
|
||||
environment.systemPackages = map lib.hiPrio [
|
||||
# Respect XDG conventions, leave my HOME alone
|
||||
(pkgs.writeShellScriptBin "steam" ''
|
||||
mkdir -p "${cfg.dataDir}"
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ in
|
|||
# Contains the UID/GID map, and other useful state
|
||||
"/var/lib/nixos"
|
||||
# SSH host keys (and public keys for convenience)
|
||||
(builtins.map (key: [ key.path "${key.path}.pub" ]) config.services.openssh.hostKeys)
|
||||
(map (key: [ key.path "${key.path}.pub" ]) config.services.openssh.hostKeys)
|
||||
];
|
||||
|
||||
services.restic.backups.backblaze = {
|
||||
|
|
|
|||
|
|
@ -188,14 +188,14 @@ in
|
|||
++ (lib.flip lib.mapAttrsToList cfg.virtualHosts (_: { subdomain, ... } @ args:
|
||||
let
|
||||
conflicts = [ "port" "root" "socket" "redirect" ];
|
||||
optionsNotNull = builtins.map (v: args.${v} != null) conflicts;
|
||||
optionsNotNull = map (v: args.${v} != null) conflicts;
|
||||
optionsSet = lib.filter lib.id optionsNotNull;
|
||||
in
|
||||
{
|
||||
assertion = builtins.length optionsSet == 1;
|
||||
message = ''
|
||||
Subdomain '${subdomain}' must have exactly one of ${
|
||||
lib.concatStringsSep ", " (builtins.map (v: "'${v}'") conflicts)
|
||||
lib.concatStringsSep ", " (map (v: "'${v}'") conflicts)
|
||||
} configured.
|
||||
'';
|
||||
}))
|
||||
|
|
@ -208,7 +208,7 @@ in
|
|||
assertion = args.websocketsLocations != [ ] -> proxyPassUsed;
|
||||
message = ''
|
||||
Subdomain '${subdomain}' can only use 'websocketsLocations' with one of ${
|
||||
lib.concatStringsSep ", " (builtins.map (v: "'${v}'") proxyPass)
|
||||
lib.concatStringsSep ", " (map (v: "'${v}'") proxyPass)
|
||||
}.
|
||||
'';
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Automatically import all overlays in the directory
|
||||
let
|
||||
files = builtins.readDir ./.;
|
||||
overlays = builtins.removeAttrs files [ "default.nix" ];
|
||||
overlays = removeAttrs files [ "default.nix" ];
|
||||
in
|
||||
builtins.mapAttrs (name: _: import "${./.}/${name}") overlays
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue