From 1213d7aeeea018043372370e6ef4229def72b6eb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 17 Apr 2018 19:27:48 +0200
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom/tinc/yggdrasil.nix | 2 +-
 hel.nix                   | 3 ---
 ymir.nix                  | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 73c8276e..337cd7f1 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -72,7 +72,7 @@ in {
     services.customTinc.networks."yggdrasil" = {
       inherit (cfg) name interfaceConfig;
       debugLevel = 2;
-      hosts = ( import ./hosts/yggdrasil.nix );
+      hosts = import ../../yggdrasil/hosts.nix;
       extraConfig = ''
         Mode = switch
         PingTimeout = 30
diff --git a/hel.nix b/hel.nix
index 547778fc..bfb902b4 100644
--- a/hel.nix
+++ b/hel.nix
@@ -193,9 +193,6 @@
       enable = true;
       connect = true;
       name = "hel";
-      interfaceConfig = {
-        ipv4.addresses = [ { address = "10.141.2.3"; prefixLength = 16; } ];
-      };
     };
 
     uucp = {
diff --git a/ymir.nix b/ymir.nix
index 192bc27b..0e6dc0a3 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -309,9 +309,6 @@ in rec {
     enable = true;
     connect = false;
     useDNS = false;
-    interfaceConfig = {
-      ipv4.addresses = [ { address = "10.141.5.1"; prefixLength = 16; } ];
-    };
   };
 
   services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) {
-- 
cgit v1.2.3