From 2b1e2bdb360d4475cacea838989131931f7a71ba Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 18 Jan 2022 21:44:17 +0100
Subject: [PATCH] Move nncp container into c3d2 vlan

---
 config/nncp-relays.nix | 4 +---
 flake.nix              | 4 ++--
 host-registry.nix      | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config/nncp-relays.nix b/config/nncp-relays.nix
index 7813a789..2351f1c0 100644
--- a/config/nncp-relays.nix
+++ b/config/nncp-relays.nix
@@ -1,5 +1,3 @@
-{ config, ... }:
-
 {
   blackbox = {
     addrs.yggdrasil = "[20b:c3d2:4aa5:62bf:4f15:ed96:fcae:7a7]:5400";
@@ -9,7 +7,7 @@
     signpub = "QYJPF3SRTJGPZAGDHAFLWPMCTBHZOKTLATYXVX6WCUSNVGBECYHA";
   };
   c3d2 = {
-    addrs.clearnet = "[${config.c3d2.hosts.nncp.ip6}]:5400";
+    addrs.yggdrasil = "[30c:c3d2:b946:76d0:dcec:9aff:fe6f:3f63]:5400";
     exchpub = "MUZ3GI6GWEEIDQSUR6YGA3KNYERUFHIHLG24OG54QJJU2X5UGAJQ";
     id = "NGQLTVQVIRZEPXB6OEOZIEGZ4SQQ2P25HBXFPEX5C57VEKQDF4BA";
     noisepub = "YLJJGNQWNO3CGTBPROUUKVTSU3TFWHTBWREXMBBPMGMPJBWXAINA";
diff --git a/flake.nix b/flake.nix
index f6e89da3..2ed40d43 100644
--- a/flake.nix
+++ b/flake.nix
@@ -510,7 +510,7 @@
 
       nixosModule = self.nixosModules.c3d2;
       nixosModules = {
-        c3d2 = { config, ... }: {
+        c3d2 = {
           imports = [
             sops-nix.nixosModule
             ./modules/c3d2.nix
@@ -518,7 +518,7 @@
           ];
           c3d2.hosts = hostRegistry.hosts;
           c3d2.users = import ./users.nix;
-          c3d2.nncp.neigh = import ./config/nncp-relays.nix { inherit config; };
+          c3d2.nncp.neigh = import ./config/nncp-relays.nix;
         };
         nncp = ./modules/nncp.nix;
         plume = {
diff --git a/host-registry.nix b/host-registry.nix
index 5464f71f..f69aa152 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -56,7 +56,7 @@
   nix-build.ip4 = "172.22.99.156";
 
   nncp = {
-    ip6 = "2a00:8180:2c00:282:dcec:9aff:fe6f:3f63";
+    ip6 = "2a00:8180:2c00:223:dcec:9aff:fe6f:3f63";
     publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQhxaeElmxO1UgaI/+qr+g13OFeY9qtJVxznNN+xs/e";
   };