Merge pull request #52 from orangci/nix

Nix

docs/example.nix

@@ -1,12 +1,11 @@
-{ dns, ... }: let 
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "satr14washere";
+{
-    email = "admin@satr14.my.id";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   A = [
-    { address = "203.0.113.1"; ttl = 60 * 60; }
+    {
+      address = "203.0.113.1";
+      ttl = 60 * 60;
+    }
     "203.0.113.2"
     (ttl (60 * 60) (a "203.0.113.3"))
   ];
@@ -18,7 +17,13 @@ in with dns.lib.combinators; {
   MX = mx.google;
 
   TXT = [
-    (with spf; strict [ "a:mail.example.com" google ])
+    (
+      with spf;
+      strict [
+        "a:mail.example.com"
+        google
+      ]
+    )
   ];
 
   DMARC = [ (dmarc.postmarkapp "mailto:re+abcdefghijk@dmarc.postmarkapp.com") ];
@@ -48,8 +53,16 @@ in with dns.lib.combinators; {
     {
       svcPriority = 1;
       targetName = ".";
-      alpn = [ "http/1.1" "h2" "h3" ];
+      alpn = [
-      ipv4hint = [ "203.0.113.1" "203.0.113.2" "203.0.113.3" ];
+        "http/1.1"
+        "h2"
+        "h3"
+      ];
+      ipv4hint = [
+        "203.0.113.1"
+        "203.0.113.2"
+        "203.0.113.3"
+      ];
       ipv6hint = [ "4321:0:1:2:3:4:567:89ab" ];
     }
   ];

domains/_discord.colin.nix

@@ -1,9 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "ColinLeDev";
+{
-  };
-  description = "Discord verification";
-  proxy = false;
-in with dns.lib.combinators; {
   TXT = [ "dh=279643a6f8677dedb1c5c63d007fc4516149679c" ];
 }

domains/_discord.cutedog5695.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "CuteDog5695";
+{
-    email = "cutedog5695@gmail.com";
-    repo = "https://github.com/CuteDog5695/cutedog5695.github.io";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   TXT = [ "dh=a7c19efb0f6bc38b97a33760f6c1ee84df4151b1" ];
 }

domains/_discord.justdeveloper.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "justdeveloper@juststudio.is-a.dev";
-    repo = "https://github.com/JustDeveloper1/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   TXT = [ "dh=6024027bc233825451e290ac37a4b4a1f838ee70" ];
 }

domains/_discord.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "satr14washere";
+{
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   TXT = [ "dh=d509fc9014e196311ed887c2e410cdefa833436e" ];
 }

domains/_discord.roki.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "Roki100";
+{
-    discord = "289479495444987904";
-  };
-in with dns.lib.combinators; {
   TXT = [ "dh=5633078cd5bfd347a896ddb0f0de017c5423aa06" ];
 }

domains/batman.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "shadowe1ite";
+{
-  };
-  proxy = true;
-in with dns.lib.combinators; {
   CNAME = [ "shadowe1ite.github.io." ];
 }

domains/c.nix

@@ -1,9 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "orangci";
+{
-    email = "c@orangc.xyz";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/colin.nix

@@ -1,9 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "ColinLeDev";
+{
-  };
-  description = "My personal portfolio hosted on my server";
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "proxy.col1n.fr." ];
 }

domains/cutedog5695.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "CuteDog5695";
+{
-    email = "cutedog5695@gmail.com";
-    repo = "https://github.com/CuteDog5695/cutedog5695.github.io";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/elkaff.nix

@@ -1,7 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "elkhaff";
+{
-  };
-in with dns.lib.combinators; {
   CNAME = [ "portofolio-pixel.pages.dev." ];
 }

domains/j.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "support@juststudio.is-a.dev";
-    repo = "https://github.com/JustStudio7/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/jacob.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "jacobrdale";
+{
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "hexon404.onrender.com." ];
 }

domains/jd.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "justdeveloper@juststudio.is-a.dev";
-    repo = "https://github.com/JustDeveloper1/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/job.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "FWEEaaaa1";
+{
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   A = [ "128.204.223.115" ];
 }

domains/joel.nix

@@ -1,10 +1,6 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "joestr";
+{
-    email = "strasser999@gmail.com";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   A = [ "142.132.173.34" ];
   AAAA = [ "2a01:4f8:1c0c:6cc0::1" ];
   MX = [

domains/js.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "support@juststudio.is-a.dev";
-    repo = "https://github.com/JustStudio7/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/just.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "justdeveloper@juststudio.is-a.dev";
-    repo = "https://github.com/JustDeveloper1/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/justdev.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "justdeveloper@juststudio.is-a.dev";
-    repo = "https://github.com/JustDeveloper1/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/justdeveloper.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "justdeveloper@juststudio.is-a.dev";
-    repo = "https://github.com/JustDeveloper1/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/juststudio.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "JustDeveloper1";
+{
-    email = "support@juststudio.is-a.dev";
-    repo = "https://github.com/JustStudio7/Website";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/katz.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "Bananalolok";
+{
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   A = [ "69.197.135.205" ];
 }

domains/no-one-is.nix

@@ -1,9 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "EducatedSuddenBucket";
+{
-    email = "me@esb.is-a.dev";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "educatedsuddenbucket-github-io.onrender.com." ];
 }

domains/pxl.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "heypxl";
+{
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "heypxl.github.io." ];
 }

domains/rchessauth.nix

@@ -1,8 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "vortexprime24";
+{
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "fire.hackclub.app." ];
 }

domains/roki.nix

@@ -1,9 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "Roki100";
+{
-    discord = "289479495444987904";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "edge.redirect.pizza." ];
 }

domains/satr14.nix

@@ -1,7 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "satr14washere";
+{
-  };
-in with dns.lib.combinators; {
   CNAME = [ "5th-site.pages.dev." ];
 }

domains/stef.nix

@@ -1,9 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "Stef-00012";
+{
-    email = "admin@stefdp.lol";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "proxy.stefdp.lol." ];
 }

domains/ukriu.nix

@@ -1,10 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "ukriu";
+{
-    email = "partofmyid@ukriu.com";
-  };
-  description = "my website";
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "ukriu.pages.dev." ];
 }

domains/you-are.nix

@@ -1,9 +1,5 @@
-{ dns, ... }: let
+{ dns, ... }:
-  owner = {
+with dns.lib.combinators;
-    username = "Stef-00012";
+{
-    email = "admin@stefdp.com";
-  };
-  proxy = false;
-in with dns.lib.combinators; {
   CNAME = [ "proxy.stefdp.com." ];
 }

flake.nix

@@ -2,7 +2,9 @@
   description = "Zone File Generator";
   inputs.dns.url = "github:nix-community/dns.nix";
 
-  outputs = { dns, ... }: let
+  outputs =
+    { dns, ... }:
+    let
       email = "admin@satr14.my.id";
       domains."0" = {
         domain = "part-of.my.id";
@@ -11,10 +13,30 @@
           "fattouche.ns.cloudflare.com"
         ];
       };
-  in {
+
-    packages.x86_64-linux = builtins.mapAttrs (_: domain:
+      inherit (import <nixpkgs> { }) lib;
+
+      domainsFolder = builtins.readDir ./domains;
+      domainFiles = lib.filterAttrs (
+        name: type: type == "regular" && builtins.match ".*\\.nix" name != null
+      ) domainsFolder;
+      subdomains = lib.mapAttrs' (
+        name: _:
+        let
+          key = builtins.replaceStrings [ ".nix" ] [ "" ] name;
+        in
+        {
+          name = key;
+          value = import (./domains + "/${name}") { inherit dns; };
+        }
+      ) domainFiles;
+    in
+    {
+      packages.x86_64-linux = builtins.mapAttrs (
+        _: domain:
         dns.util.x86_64-linux.writeZone domain.domain (
-        with dns.lib.combinators; {
+          with dns.lib.combinators;
+          {
             SOA = {
               adminEmail = email;
               nameServer = builtins.head domain.nameservers;
@@ -24,8 +46,7 @@
 
             # note: Cloudflare ignores SOA and NS records uploaded via Zone File, they are included just so that dns.nix builds a valid zone file.
 
-          #subdomains = ;
+            inherit subdomains;
-          # ^^ todo: implement file imports from ./domains
           }
         )
       ) domains;