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

This commit is contained in:
Anderson Torres 2023-07-28 22:27:18 -03:00
parent 2dd9923c8a
commit 871bf7c875

View File

@ -2,15 +2,16 @@ import ./make-test-python.nix ({ lib, ... }: {
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;
};
@ -26,7 +27,7 @@ import ./make-test-python.nix ({ lib, ... }: {
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}"; } ];
@ -38,13 +39,13 @@ import ./make-test-python.nix ({ lib, ... }: {
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 = {