local changes

This commit is contained in:
Thilo Billerbeck 2024-07-22 20:23:58 +02:00
parent 53a4df4b2d
commit 7fc629055b
2 changed files with 30 additions and 21 deletions

View file

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

View file

@ -55,37 +55,46 @@ 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 // buildersCCCDA;
matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses;
};
}