nixos/tests/systemd-initrd-networkd-ssh.nix: remove overuses of `with`

Changed files
+9 -8
nixos
+9 -8
nixos/tests/systemd-initrd-networkd-ssh.nix
···
name = "systemd-initrd-network-ssh";
meta.maintainers = [ lib.maintainers.elvishjerricco ];
-
nodes = with lib; {
+
nodes = {
server = { config, pkgs, ... }: {
-
environment.systemPackages = [pkgs.cryptsetup];
+
environment.systemPackages = [ pkgs.cryptsetup ];
boot.loader.systemd-boot.enable = true;
boot.loader.timeout = 0;
virtualisation = {
emptyDiskImages = [ 4096 ];
useBootLoader = true;
-
# Booting off the encrypted disk requires an available init script from the Nix store
+
# Booting off the encrypted disk requires an available init script from
+
# the Nix store
mountHostNixStore = true;
useEFIBoot = true;
};
···
enable = true;
ssh = {
enable = true;
-
authorizedKeys = [ (readFile ./initrd-network-ssh/id_ed25519.pub) ];
+
authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ];
port = 22;
# Terrible hack so it works with useBootLoader
hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ];
···
client = { config, ... }: {
environment.etc = {
knownHosts = {
-
text = concatStrings [
+
text = lib.concatStrings [
"server,"
"${
-
toString (head (splitString " " (toString
-
(elemAt (splitString "\n" config.networking.extraHosts) 2))))
+
toString (lib.head (lib.splitString " " (toString
+
(lib.elemAt (lib.splitString "\n" config.networking.extraHosts) 2))))
} "
-
"${readFile ./initrd-network-ssh/ssh_host_ed25519_key.pub}"
+
"${lib.readFile ./initrd-network-ssh/ssh_host_ed25519_key.pub}"
];
};
sshKey = {