From 65af889b1960886f10a821fe63457b1a7b83ad42 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Mon, 3 Oct 2022 02:58:28 -0400
Subject: [PATCH] switch to tailscale

---
 home-manager/common/programs/core.nix | 2 +-
 machines/oracles/configuration.nix    | 1 -
 machines/tounge/configuration.nix     | 5 ++---
 modules/linux/services/tailscale.nix  | 7 -------
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/home-manager/common/programs/core.nix b/home-manager/common/programs/core.nix
index 1198ccd..442a5b1 100644
--- a/home-manager/common/programs/core.nix
+++ b/home-manager/common/programs/core.nix
@@ -189,7 +189,7 @@ with lib;
           "tounge" = {
             forwardAgent = true;
             user = "nathan";
-            hostname = "172.23.98.121";
+            hostname = "100.75.37.98";
           };
           "shadowchild" = {
             forwardAgent = true;
diff --git a/machines/oracles/configuration.nix b/machines/oracles/configuration.nix
index e14f08b..7912f30 100644
--- a/machines/oracles/configuration.nix
+++ b/machines/oracles/configuration.nix
@@ -85,7 +85,6 @@
     firewall = {
       allowedTCPPorts = [ 25565 ];
       allowedUDPPorts = [ 25565 ];
-      trustedInterfaces = [ "zt5u4uutwm" ];
     };
   };
 
diff --git a/machines/tounge/configuration.nix b/machines/tounge/configuration.nix
index 8b73ce1..0f559ea 100644
--- a/machines/tounge/configuration.nix
+++ b/machines/tounge/configuration.nix
@@ -82,8 +82,8 @@
     ports = [
       "10.0.0.10:53:53/tcp"
       "10.0.0.10:53:53/udp"
-      "172.23.98.121:53:53/tcp"
-      "172.23.98.121:53:53/udp"
+      "100.75.37.98:53:53/tcp"
+      "100.75.37.98:53:53/udp"
       "3080:80"
       "30443:443"
     ];
@@ -95,7 +95,6 @@
       "--cap-add=NET_ADMIN"
       "--dns=1.1.1.1"
     ];
-    workdir = "/var/lib/pihole/";
   };
 
   # Nginx virtual hosts
diff --git a/modules/linux/services/tailscale.nix b/modules/linux/services/tailscale.nix
index 27664e3..5c2ff2f 100644
--- a/modules/linux/services/tailscale.nix
+++ b/modules/linux/services/tailscale.nix
@@ -51,12 +51,5 @@ with lib;
       checkReversePath = "loose";
       trustedInterfaces = [ "tailscale0" ];
     };
-
-    # Also enable zerotierone for now
-    # TODO: Get completely migrated away from this
-    services.zerotierone = {
-      enable = true;
-      joinNetworks = [ "c7c8172af15d643d" ];
-    };
   };
 }