home-manager/modules/packages.nix

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

home-manager/programs/ssh.nix

@@ -55,46 +55,37 @@ let
         PubkeyAcceptedKeyTypes = "+ssh-rsa";
       };
     };
-    "flanders" = {
-      identityFile = "~/.ssh/id_thilo-billerbeck-com";
-      user = "thilo";
-    };
   };
   catchAlls = builtins.listToAttrs (
-    builtins.map
+    builtins.map (host: {
-      (host: {
       name = "*.${host}";
       value = {
         identityFile = "~/.ssh/id_thilo-billerbeck-com";
         user = "root";
       };
-      })
+    }) ownDomains
-      ownDomains
   );
   hostnameAliasses = builtins.listToAttrs (
-    builtins.map
+    builtins.map (host: {
-      (host: {
       name = "${host}";
       value = {
         hostname = "${host}.thilo-billerbeck.com";
       };
-      })
+    }) thiloBillerbeckHosts
-      thiloBillerbeckHosts
   );
   buildersCCCDA = builtins.listToAttrs (
-    builtins.map
+    builtins.map (host: {
-      (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;
   };
 }