From b3bd77a01b3d4f00c6112aa30b9046ba67c6b4a7 Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Wed, 21 Apr 2021 20:09:48 -0400
Subject: [PATCH] nixos/lib: move nerr-3 to management VLAN

---
 nixos/lib/vargen/main.go |  6 +++---
 nixos/lib/vars.json      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/lib/vargen/main.go b/nixos/lib/vargen/main.go
index 6b5187a..2d266ed 100644
--- a/nixos/lib/vargen/main.go
+++ b/nixos/lib/vargen/main.go
@@ -85,9 +85,9 @@ func main() {
 
 		desktop = newHost(
 			"nerr-3",
-			tengb0,
-			netaddr.MustParseIP("192.168.110.6"),
-			mac("90:e2:ba:23:1a:3a"),
+			enp2s0,
+			netaddr.MustParseIP("192.168.1.7"),
+			mac("04:d9:f5:7e:1c:47"),
 		)
 	)
 
diff --git a/nixos/lib/vars.json b/nixos/lib/vars.json
index 986e414..8966a68 100644
--- a/nixos/lib/vars.json
+++ b/nixos/lib/vars.json
@@ -1,7 +1,7 @@
 {
 	"server_ipv4": "192.168.1.6",
 	"server_ipv6": "2600:6c4a:787f:5900:1e1b:dff:feea:830f",
-	"desktop_ipv6": "2600:6c4a:787f:596e:92e2:baff:fe23:1a3a",
+	"desktop_ipv6": "2600:6c4a:787f:5900:6d9:f5ff:fe7e:1c47",
 	"hosts": {
 		"servers": [
 			{
@@ -16,13 +16,13 @@
 			},
 			{
 				"name": "nerr-3",
-				"ipv4": "192.168.110.6",
+				"ipv4": "192.168.1.7",
 				"ipv6": {
-					"gua": "2600:6c4a:787f:596e:92e2:baff:fe23:1a3a",
-					"ula": "fd9e:1a04:f01d:110:92e2:baff:fe23:1a3a",
-					"lla": "fe80::92e2:baff:fe23:1a3a"
+					"gua": "2600:6c4a:787f:5900:6d9:f5ff:fe7e:1c47",
+					"ula": "fd9e:1a04:f01d:0:6d9:f5ff:fe7e:1c47",
+					"lla": "fe80::6d9:f5ff:fe7e:1c47"
 				},
-				"mac": "90:e2:ba:23:1a:3a"
+				"mac": "04:d9:f5:7e:1c:47"
 			},
 			{
 				"name": "theatnerr-1",