From 96f9cf36b6eb9af9dbbbd5b03b551548d0c71852 Mon Sep 17 00:00:00 2001
From: kat <kat@inskip.me>
Date: Mon, 11 Jul 2022 10:46:57 -0700
Subject: [PATCH] refactor: move around irl stuff

---
 nixos/systems/marisa.nix | 3 ++-
 services/irlmail.nix     | 4 ++--
 targets/home.nix         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/systems/marisa.nix b/nixos/systems/marisa.nix
index 552f0b5e..b18e0f06 100644
--- a/nixos/systems/marisa.nix
+++ b/nixos/systems/marisa.nix
@@ -4,7 +4,8 @@
     nixos.network
     services.nginx
     services.access
-  ] ++ optional (meta.trusted ? services) trusted.services.website;
+    services.irlsite
+  ];
 
 
   deploy.tf = {
diff --git a/services/irlmail.nix b/services/irlmail.nix
index d0b4f55c..2f768df4 100644
--- a/services/irlmail.nix
+++ b/services/irlmail.nix
@@ -25,11 +25,11 @@
   dns.records = {
     services_inskip_a = {
       zone = "inskip.me.";
-      a.address = meta.network.nodes.marisa.network.addresses.public.nixos.ipv4.address;
+      a.address = meta.network.nodes.nixos.marisa.network.addresses.public.nixos.ipv4.address;
     };
     services_inskip_aaaa = {
       zone = "inskip.me.";
-      aaaa.address = meta.network.nodes.marisa.network.addresses.public.nixos.ipv6.address;
+      aaaa.address = meta.network.nodes.nixos.marisa.network.addresses.public.nixos.ipv6.address;
     };
     services_gmail_spf = {
       zone = "inskip.me.";
diff --git a/targets/home.nix b/targets/home.nix
index 1fb6ed55..3f4a7efc 100644
--- a/targets/home.nix
+++ b/targets/home.nix
@@ -3,7 +3,7 @@
 {
   deploy.targets.home = {
     tf = { config, ... }: {
-      imports = optional (builtins.pathExists ../trusted/mail.nix) ../trusted/mail.nix;
+      imports = optional (builtins.pathExists ../services/irlmail.nix) ../services/irlmail.nix;
 
       dns.records.ygg_grimoire = {
         zone = "kittywit.ch.";