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

View file

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