1 files changed, 33 insertions, 12 deletions

diff --git a/common/tinc.nix b/common/tinc.nix
index d86b19c..e06bd27 100644
--- a/common/tinc.nix
+++ b/common/tinc.nix
@@ -1,11 +1,15 @@
+inputs:
+
 { config, lib, ... }:
 
 with lib;
 with builtins;
-let
-  networks = attrNames (readDir ./tinc/private);
-in {
-  imports = map (network: (./tinc/private + "/${network}")) networks;
+{
+  imports = [
+    (inputs.nixpkgs-unstable.outPath + "/nixos/modules/services/networking/tinc.nix")
+  ];
+
+  disabledModules = [ "services/networking/tinc.nix" ];
 
   options.topology = {
     mainVpn = {
@@ -27,16 +31,33 @@ in {
   };
 
   config = {
-    services.tinc.networks = genAttrs networks (network: {
-      name = config.networking.hostName;
-
-      hosts = let
-        hosts = attrNames (readDir (./tinc/private + "/${network}/hosts"));
-        config = hostname: readFile (./tinc/private + "/${network}/hosts/${hostname}");
-      in genAttrs hosts config;
-    });
+    # Tinc configuration is in downstream repo
 
     networking.firewall.allowedUDPPorts = [ 655 ];
     networking.firewall.allowedTCPPorts = [ 655 ];
+
+    networking.hosts =
+      with builtins;
+      with lib;
+      let
+        networks = config.services.tinc.networks;
+        hosts = (flatten
+          (mapAttrsToList
+            (name: network: mapAttrsToList
+              (host: settings: {
+                host = "${host}.${name}.vpn";
+                addresses = map (subnet: subnet.address) settings.subnets;
+              })
+              network.hostSettings)
+            networks));
+
+        addresses =
+          zipAttrs
+            (flatten
+              (forEach hosts ({ host, addresses }:
+                (forEach addresses (address:
+                  { "${address}" = host; })))));
+      in
+      addresses;
   };
 }