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 insomnia)
(nixGL comma) (nixGL comma)
# (nixGL processing)
(nixGL scrcpy) (nixGL scrcpy)
] ]
else else

View file

@ -55,35 +55,26 @@ let
PubkeyAcceptedKeyTypes = "+ssh-rsa"; PubkeyAcceptedKeyTypes = "+ssh-rsa";
}; };
}; };
"flanders" = {
identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "thilo";
};
}; };
catchAlls = builtins.listToAttrs ( catchAlls = builtins.listToAttrs (
builtins.map builtins.map (host: {
(host: {
name = "*.${host}"; name = "*.${host}";
value = { value = {
identityFile = "~/.ssh/id_thilo-billerbeck-com"; identityFile = "~/.ssh/id_thilo-billerbeck-com";
user = "root"; user = "root";
}; };
}) }) ownDomains
ownDomains
); );
hostnameAliasses = builtins.listToAttrs ( hostnameAliasses = builtins.listToAttrs (
builtins.map builtins.map (host: {
(host: {
name = "${host}"; name = "${host}";
value = { value = {
hostname = "${host}.thilo-billerbeck.com"; hostname = "${host}.thilo-billerbeck.com";
}; };
}) }) thiloBillerbeckHosts
thiloBillerbeckHosts
); );
buildersCCCDA = builtins.listToAttrs ( buildersCCCDA = builtins.listToAttrs (
builtins.map builtins.map (host: {
(host: {
name = "build${host}.darmstadt.ccc.de"; name = "build${host}.darmstadt.ccc.de";
value = { value = {
user = "avocadoom"; user = "avocadoom";
@ -95,6 +86,6 @@ in
{ {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses; matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses // buildersCCCDA;
}; };
} }