Compare commits

..

No commits in common. "97f17c21e21d66529536e594e4a1a54f9589a143" and "4105c1068da8305c373a293754805cb477aca015" have entirely different histories.

2 changed files with 20 additions and 30 deletions

View file

@ -100,7 +100,6 @@ in
[
(nixGL insomnia)
(nixGL comma)
# (nixGL processing)
(nixGL scrcpy)
]
else

View file

@ -55,46 +55,37 @@ let
PubkeyAcceptedKeyTypes = "+ssh-rsa";
};
};
"flanders" = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "thilo";
};
};
catchAlls = builtins.listToAttrs (
builtins.map
(host: {
name = "*.${host}";
value = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "root";
};
})
ownDomains
builtins.map (host: {
name = "*.${host}";
value = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "root";
};
}) ownDomains
);
hostnameAliasses = builtins.listToAttrs (
builtins.map
(host: {
name = "${host}";
value = {
hostname = "${host}.thilo-billerbeck.com";
};
})
thiloBillerbeckHosts
builtins.map (host: {
name = "${host}";
value = {
hostname = "${host}.thilo-billerbeck.com";
};
}) thiloBillerbeckHosts
);
buildersCCCDA = builtins.listToAttrs (
builtins.map
(host: {
name = "build${host}.darmstadt.ccc.de";
value = {
user = "avocadoom";
builtins.map (host: {
name = "build${host}.darmstadt.ccc.de";
value = {
user = "avocadoom";
identityFile = "~/.ssh/id_darmstadt-ccc-de";
};
}) [ "1" "2" "3" "4" ]
};
}) ["1" "2" "3" "4"]
);
in
{
programs.ssh = {
enable = true;
matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses;
matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses // buildersCCCDA;
};
}