From 0c17f85fc808f841edba3b42db8abe82e170c696 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Tue, 7 Sep 2021 05:05:17 +0100
Subject: [PATCH] network: Fix domain creation for TF provisioned hosts.

---
 config/profiles/network.nix          |  2 +-
 config/services/knot/default.nix     |  2 ++
 config/targets/rinnosuke-domains.nix | 15 +++++++++++++++
 nix/sources.json                     |  6 +++---
 overlays/exprs                       |  2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/config/profiles/network.nix b/config/profiles/network.nix
index 9c309195..87cd29cd 100644
--- a/config/profiles/network.nix
+++ b/config/profiles/network.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: with lib;
 
 {
   options.network = with lib; {
diff --git a/config/services/knot/default.nix b/config/services/knot/default.nix
index 6b3562f1..6fd10c4b 100644
--- a/config/services/knot/default.nix
+++ b/config/services/knot/default.nix
@@ -1,6 +1,8 @@
 { config, lib, tf, pkgs, ... }:
 
 {
+  network.dns.enable = false;
+
   kw.secrets.variables = {
     katdns-key-config = {
       path = "secrets/katdns";
diff --git a/config/targets/rinnosuke-domains.nix b/config/targets/rinnosuke-domains.nix
index a28533b9..2f12f728 100644
--- a/config/targets/rinnosuke-domains.nix
+++ b/config/targets/rinnosuke-domains.nix
@@ -14,6 +14,21 @@ let rinnosuke = config.network.nodes.rinnosuke; in
         domain = rinnosuke.networking.hostName;
         aaaa.address = rinnosuke.network.addresses.public.nixos.ipv6.address;
       };
+      node_wireguard_rinnosuke_v4 = {
+        inherit (rinnosuke.network.dns) zone;
+        domain = rinnosuke.network.addresses.wireguard.subdomain;
+        a.address = rinnosuke.network.addresses.wireguard.nixos.ipv4.address;
+      };
+      node_wireguard_rinnosuke_v6 = {
+        inherit (rinnosuke.network.dns) zone;
+        domain = rinnosuke.network.addresses.wireguard.subdomain;
+        aaaa.address = rinnosuke.network.addresses.wireguard.nixos.ipv6.address;
+      };
+      node_yggdrasil_rinnosuke_v6 = {
+        inherit (rinnosuke.network.dns) zone;
+        domain = rinnosuke.network.addresses.yggdrasil.subdomain;
+        aaaa.address = rinnosuke.network.addresses.yggdrasil.nixos.ipv6.address;
+      };
     };
   };
 }
diff --git a/nix/sources.json b/nix/sources.json
index cdd268d2..842d8835 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -89,10 +89,10 @@
         "homepage": null,
         "owner": "kittywitch",
         "repo": "nixexprs",
-        "rev": "0dc07928ed3c26100c3fe8e6de22af7259cebbad",
-        "sha256": "0h8x0d1fq9rbndds87aa4zjy5ccdvjwx1zmylqdrp9223vynnbb6",
+        "rev": "4d6613a56184318e7a4dc845a1d641a8e9daa6f1",
+        "sha256": "0rs7vm5yh0myq1hhycsrpwxrvysy721zj9i9gy1s37bwgcdyvhml",
         "type": "tarball",
-        "url": "https://github.com/kittywitch/nixexprs/archive/0dc07928ed3c26100c3fe8e6de22af7259cebbad.tar.gz",
+        "url": "https://github.com/kittywitch/nixexprs/archive/4d6613a56184318e7a4dc845a1d641a8e9daa6f1.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
diff --git a/overlays/exprs b/overlays/exprs
index 0dc07928..4d6613a5 160000
--- a/overlays/exprs
+++ b/overlays/exprs
@@ -1 +1 @@
-Subproject commit 0dc07928ed3c26100c3fe8e6de22af7259cebbad
+Subproject commit 4d6613a56184318e7a4dc845a1d641a8e9daa6f1