fra1-b: use spipe with shorthand

hosts/vno1-gdrx/configuration.nix

@@ -159,13 +159,6 @@ in
         saslPasswdPath = config.age.secrets.sasl-passwd.path;
       };
 
-      #syncthing = {
-      #  enable = true;
-      #  dataDir = "/home/motiejus/";
-      #  user = "motiejus";
-      #  group = "users";
-      #};
-
     };
   };
 

modules/base/sshd/default.nix

@@ -27,11 +27,19 @@
         ''
           Host git.jakstys.lt
             HostName ${myData.hosts."fwminex.servers.jakst".jakstIP}
+
         ''
-        + (lib.concatMapStringsSep "\n" (host: ''
+        + (lib.concatMapStringsSep "\n"
-          Host ${builtins.elemAt (lib.splitString "." host) 0}
+          (host: ''
-            HostName ${myData.hosts.${host}.jakstIP}
+            Host ${builtins.elemAt (lib.splitString "." host) 0}
-        '') (builtins.attrNames (lib.filterAttrs (_: props: props ? jakstIP) myData.hosts)));
+              HostName ${myData.hosts.${host}.jakstIP}
+          '')
+          (
+            builtins.attrNames (
+              lib.filterAttrs (name: props: name != "fra1-b.servers.jakst" && props ? jakstIP) myData.hosts
+            )
+          )
+        );
     };
   };
 }

modules/services/ssh8022/default.nix

@@ -30,6 +30,10 @@
         programs.ssh.extraConfig = ''
           Host fra1-b.jakstys.lt jakstys.lt
             ProxyCommand ${pkgs.spiped}/bin/spipe -t %h:8022 -k ${cfg.keyfile}
+
+          Host fra1-b
+            HostName fra1-b.jakstys.lt
+            ProxyCommand ${pkgs.spiped}/bin/spipe -t %h:8022 -k ${cfg.keyfile}
         '';
       }
     )