From d4a517f4b4ce067702248fdc944dca3f20df7791 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 14 Sep 2022 23:25:01 +0300 Subject: 2022-09-14 --- modules/nixfiles/emacs/doom/config.el | 6 ++--- modules/nixfiles/emacs/doom/init.el | 2 +- modules/nixfiles/nsd.nix | 48 ++++++++++++++++++++--------------- 3 files changed, 31 insertions(+), 25 deletions(-) (limited to 'modules') diff --git a/modules/nixfiles/emacs/doom/config.el b/modules/nixfiles/emacs/doom/config.el index 92659e9..546af9a 100644 --- a/modules/nixfiles/emacs/doom/config.el +++ b/modules/nixfiles/emacs/doom/config.el @@ -157,19 +157,19 @@ `(:host "shire.me" :port 6667 :user "azahi/libera" - :pass #'nixfiles/irc-bouncer-password-f)) + :pass nixfiles/irc-bouncer-password-f)) (set-irc-server! "oftc" `(:host "shire.me" :port 6667 :user "azahi/oftc" - :pass #'nixfiles/irc-bouncer-password-f)) + :pass nixfiles/irc-bouncer-password-f)) (set-irc-server! "rizon" `(:host "shire.me" :port 6667 :user "azahi/rizon" - :pass #'nixfiles/irc-bouncer-password-f)) + :pass nixfiles/irc-bouncer-password-f)) ;; (use-package! hledger-mode ;; :mode ("\\.journal\\'") diff --git a/modules/nixfiles/emacs/doom/init.el b/modules/nixfiles/emacs/doom/init.el index b547cb9..9da7f4b 100644 --- a/modules/nixfiles/emacs/doom/init.el +++ b/modules/nixfiles/emacs/doom/init.el @@ -31,7 +31,7 @@ (evil +everywhere) file-templates fold - (format +onsave) + format ;; lispy ;; multiple-cursors parinfer diff --git a/modules/nixfiles/nsd.nix b/modules/nixfiles/nsd.nix index 7abae70..acbfd07 100644 --- a/modules/nixfiles/nsd.nix +++ b/modules/nixfiles/nsd.nix @@ -63,31 +63,36 @@ in { sldIps ? (ips "manwe"), extra ? {}, }: { - ${domain}.data = dns.toString domain ({ + ${domain}.data = dns.toString domain (mkMerge [ + { TTL = 60 * 60; SOA = { nameServer = "${cfg.fqdn}."; adminEmail = "admin+dns@${my.domain.shire}"; - serial = 2022081122; + serial = 2022091420; }; - NS = with my.domain; ["ns1.${shire}" "ns2.${shire}"]; + NS = with my.domain; [ + "ns1.${shire}" + # "ns2.${shire}" + ]; CAA = letsEncrypt "admin+caa@${my.domain.shire}"; } - // sldIps - // extra); + sldIps + extra + ]); }; in mkMerge [ (mkZone { domain = my.domain.shire; - extra = + extra = mkMerge [ (mkEmailEntries { dkimKey = "@DKIM_KEY@"; }) - // { + { subdomains = rec { manwe = ips "manwe"; "*.manwe" = manwe; @@ -110,40 +115,41 @@ in { rss-bridge = manwe; vaultwarden = manwe; }; - }; + } + ]; }) (mkZone { domain = my.domain.azahi; - extra = + extra = mkMerge [ (mkEmailEntries { dkimKey = "@DKIM_KEY@"; }) - // { - subdomains = { - github.CNAME = ["github.com/${my.username}"]; - gitlab.CNAME = ["gitlab.com/${my.username}"]; - }; - }; + { + TXT = ["openpgp4fpr:${my.pgp.fingerprint}"]; # https://docs.keyoxide.org/service-providers/dns/ + } + ]; }) (mkZone { domain = my.domain.gondor; - extra = + extra = mkMerge [ (mkEmailEntries { dkimKey = "@DKIM_KEY@"; }) - // { + { subdomains.frodo = ips "manwe"; - }; + } + ]; }) (mkZone { domain = my.domain.rohan; - extra = + extra = mkMerge [ (mkEmailEntries { dkimKey = "@DKIM_KEY@"; }) - // { + { subdomains.frodo = ips "manwe"; - }; + } + ]; }) ]; }; -- cgit 1.4.1