From bd3900f52b73f7173bf68c30d74af735f6f75b34 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sun, 26 Dec 2021 19:32:31 +0000
Subject: [PATCH] modules/nixos: Fix bug, services/website: Building fix

---
 config/modules/nixos/network.nix | 7 +++++--
 config/services/website.nix      | 2 +-
 config/tf                        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/modules/nixos/network.nix b/config/modules/nixos/network.nix
index e031412b..9365786d 100644
--- a/config/modules/nixos/network.nix
+++ b/config/modules/nixos/network.nix
@@ -179,11 +179,14 @@ in
       };
 
 
-      networking = {
+      networking = mkMerge [{
         domain = mkDefault (if cfg.addresses.public.enable then cfg.dns.domain
         else if cfg.addresses.private.enable then "${cfg.addresses.private.prefix}.${cfg.dns.domain}" else "");
+      }
+      (mkIf cfg.addresses.private.enable {
         defaultGateway = mkDefault cfg.privateGateway;
-      };
+      })
+      ];
 
       deploy.tf.dns.records =
         let
diff --git a/config/services/website.nix b/config/services/website.nix
index ca10bdcb..9fd4b7b9 100644
--- a/config/services/website.nix
+++ b/config/services/website.nix
@@ -5,7 +5,7 @@
 
   services.nginx.virtualHosts = {
     "${config.network.dns.domain}" = {
-      #root = pkgs.kittywitch-site;
+      root = pkgs.kittywitch-site;
       enableACME = true;
       forceSSL = true;
     };
diff --git a/config/tf b/config/tf
index d1a8b226..59407637 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit d1a8b226aa046cca35abede281c61159aebc58e2
+Subproject commit 5940763767ab723f39806dd61d21fb82975c4bb8