From dbf80fbe361d4492b4c3e2a55a6514fd96a9ca93 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Tue, 31 Aug 2021 01:57:40 +0100
Subject: [PATCH] rinnosuke: rework to move DNS records into separate target

---
 config/hosts/rinnosuke/nixos.nix             |  1 +
 config/profiles/base/network.nix             |  4 ++--
 config/targets/rinnosuke-domains/default.nix | 18 ++++++++++++++++++
 nix/sources.json                             |  6 +++---
 overlays/exprs                               |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 config/targets/rinnosuke-domains/default.nix

diff --git a/config/hosts/rinnosuke/nixos.nix b/config/hosts/rinnosuke/nixos.nix
index b19d8feb..924feb6b 100644
--- a/config/hosts/rinnosuke/nixos.nix
+++ b/config/hosts/rinnosuke/nixos.nix
@@ -44,6 +44,7 @@ in
   };
 
   network = {
+    dns.enable = false;
     addresses = {
       public = {
         enable = true;
diff --git a/config/profiles/base/network.nix b/config/profiles/base/network.nix
index 01042c05..47c5839b 100644
--- a/config/profiles/base/network.nix
+++ b/config/profiles/base/network.nix
@@ -1,11 +1,11 @@
-{ config, lib, ... }:
+{ config, lib, ... }: with lib;
 
 {
   network = {
     enable = true;
     nftables.enable = true;
     dns = {
-      enable = true;
+      enable = mkDefault true;
       email = "acme@kittywit.ch";
       tld = "kittywit.ch.";
     };
diff --git a/config/targets/rinnosuke-domains/default.nix b/config/targets/rinnosuke-domains/default.nix
new file mode 100644
index 00000000..e1c96ce3
--- /dev/null
+++ b/config/targets/rinnosuke-domains/default.nix
@@ -0,0 +1,18 @@
+{ config, ... }:
+
+let rinnosuke = config.network.nodes.rinnosuke; in {
+  deploy.targets.rinnosuke-domains.tf = {
+    dns.records = {
+      node_public_rinnosuke_v4 = {
+        tld = rinnosuke.network.dns.tld;
+        domain = rinnosuke.networking.hostName;
+        a.address = rinnosuke.network.addresses.public.nixos.ipv4.address;
+      };
+      node_public_rinnosuke_v6 = {
+        tld = rinnosuke.network.dns.tld;
+        domain = rinnosuke.networking.hostName;
+        aaaa.address = rinnosuke.network.addresses.public.nixos.ipv6.address;
+      };
+    };
+  };
+}
diff --git a/nix/sources.json b/nix/sources.json
index 09243bc0..658169b6 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -89,10 +89,10 @@
         "homepage": null,
         "owner": "kittywitch",
         "repo": "nixexprs",
-        "rev": "1d3794d833bd3c76f5244410b44f947b8b0460b1",
-        "sha256": "0rf44z4k9xqvdqbkppdgw467r0znabn4ad0qv6q7b1149r7y9mfs",
+        "rev": "72c9b8619aabcf1e4e44511494f52b465e1687b8",
+        "sha256": "0bk3qc12f0xlz4lwijwyl58pmjy8h82xka7vb7qh4jz2mwdv8d93",
         "type": "tarball",
-        "url": "https://github.com/kittywitch/nixexprs/archive/1d3794d833bd3c76f5244410b44f947b8b0460b1.tar.gz",
+        "url": "https://github.com/kittywitch/nixexprs/archive/72c9b8619aabcf1e4e44511494f52b465e1687b8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
diff --git a/overlays/exprs b/overlays/exprs
index 1d3794d8..72c9b861 160000
--- a/overlays/exprs
+++ b/overlays/exprs
@@ -1 +1 @@
-Subproject commit 1d3794d833bd3c76f5244410b44f947b8b0460b1
+Subproject commit 72c9b8619aabcf1e4e44511494f52b465e1687b8