1 files changed, 7 insertions, 6 deletions

diff --git a/ymir.nix b/ymir.nix
index e02be94d..d74fcd9c 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -30,6 +30,7 @@ in rec {
       ./custom/zsh.nix
       ./users.nix
       ./custom/tinc/def.nix
+      ./custom/tinc/yggdrasil.nix
       ./custom/ymir-nginx.nix
       ./custom/uucp.nix
       ./custom/unit-status-mail.nix
@@ -271,16 +272,16 @@ in rec {
     chmod 0640 /etc/shadow
   '';
 
-  services.customTinc.networks = ((import ./custom/tinc/yggdrasil.nix) {
-    inherit (pkgs) stdenv nettools openresolv;
-    name = "ymir";
+  services.yggdrasilTinc = {
+    enable = true;
     connect = false;
     useDNS = false;
-    ipConf = {
+    interfaceConfig = {
       ip4 = [ { address = "10.141.5.1"; prefixLength = 16; } ];
     };
-    })
-    // ((import ./custom/tinc/laeradhr.nix) {
+  };
+
+  services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) {
      inherit (pkgs) stdenv nettools openresolv;
     name = "ymir";
     connect = false;