From a3f83151a8f7b9d33bb0aa66cc08914d875cb757 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Thu, 22 Jan 2026 18:36:23 +0100
Subject: [PATCH] Add other domains; pvv.no, nucc.org

---
 zoneConfig.nix     |  9 ++++++++-
 zones/nucc.org.nix | 35 +++++++++++++++++++++++++++++++++++
 zones/pvv.no.nix   | 20 ++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 zones/nucc.org.nix
 create mode 100644 zones/pvv.no.nix

diff --git a/zoneConfig.nix b/zoneConfig.nix
index 65810f8..4243ec7 100644
--- a/zoneConfig.nix
+++ b/zoneConfig.nix
@@ -11,11 +11,18 @@ let
     lib.mapAttrs
       (name: path: writeText "${name}.zone" (dns.lib.toString name (import path { inherit dns lib; })))
       {
+        # Main forward zones
         "pvv.ntnu.no" = ./zones/pvv.ntnu.no.nix;
         "pvv.org" = ./zones/pvv.org.nix;
-        "210.241.129.in-addr.arpa" = ./zones/reverse-ipv4-parent.nix;
+
+        # Main reverse zones
         "128-255.210.241.129.in-addr.arpa" = ./zones/reverse-ipv4.nix;
         "9.1.0.0.3.0.0.0.7.0.1.0.0.2.ip6.arpa" = ./zones/reverse-ipv6.nix;
+
+        # Other zones
+        "210.241.129.in-addr.arpa" = ./zones/reverse-ipv4-parent.nix;
+        "nucc.org" = ./zones/nucc.org.nix;
+        "pvv.no" = ./zones/pvv.no.nix;
       };
 in
 stdenvNoCC.mkDerivation {
diff --git a/zones/nucc.org.nix b/zones/nucc.org.nix
new file mode 100644
index 0000000..e2d1af6
--- /dev/null
+++ b/zones/nucc.org.nix
@@ -0,0 +1,35 @@
+{ dns, lib, ... }:
+
+with dns.lib.combinators;
+{
+  useOrigin = true; # Don't output fully qualified names
+
+  SOA = {
+    nameServer = "dvask.pvv.ntnu.no";
+    adminEmail = "drift@pvv.ntnu.no";
+    serial = 2025021701; # TODO: Automate
+  };
+
+  NS = [
+    "dvask.pvv.ntnu.no."
+    "nixon.acc.umu.se."
+  ];
+
+  MX = [
+    {
+      preference = 10;
+      exchange = "pingu.nvg.ntnu.no.";
+    }
+  ];
+
+  A = [ "129.241.210.18" ];
+  AAAA = [ "2001:700:300:2000::18" ];
+  TXT = [ "Nordic University Computer Clubs Conference" ];
+
+  subdomains = {
+    "2011".CNAME = [ "www.ping.uio.no." ];
+    "2012".CNAME = [ "nucc.lysator.liu.se." ];
+    wiki.CNAME = [ "www.ping.uio.no." ];
+    www.CNAME = [ "romeo-klive.nvg.ntnu.no." ];
+  };
+}
diff --git a/zones/pvv.no.nix b/zones/pvv.no.nix
new file mode 100644
index 0000000..d5d130d
--- /dev/null
+++ b/zones/pvv.no.nix
@@ -0,0 +1,20 @@
+{ dns, lib, ... }:
+
+with dns.lib.combinators;
+{
+  useOrigin = true; # Don't output fully qualified names
+
+  SOA = {
+    nameServer = "dvask.pvv.ntnu.no";
+    adminEmail = "drift@pvv.ntnu.no";
+    serial = 2025021701; # TODO: Automate
+  };
+  NS = [
+    "dvask.pvv.ntnu.no"
+    "ns1.ntnu.no"
+    "ping.uio.no"
+  ];
+
+  # Note: pvv.no er _"reservert"_ av PVV, ikke legg innslag her
+
+}