lots of changes, including revamp of network services boot chain on mercury

1 files changed, 12 insertions, 6 deletions

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index c2b312f..3adf620 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -1,5 +1,5 @@
 {config, ...}: let
-  tailscaleIP = "100.69.180.89";
+  tailscaleIP = "100.100.218.182";
 in {
   collinux = {
     user.name = "collin";
@@ -7,6 +7,7 @@ in {
     secrets = {
       "williams-psk".file = ./williams-psk.age;
       "caddy-env".file = ./caddy-env.age;
+      "tsnsrv-authkey".file = ./tsnsrv-authkey.age;
     };
 
     terminal = {
@@ -33,7 +34,10 @@ in {
             gateway = "192.168.50.1";
           };
         };
-        tailscale.enable = true;
+        tailscale = {
+          enable = true;
+          tailnet = "collinux.tailnet";
+        };
         sshd = {
           enable = true;
           bind_host = tailscaleIP;
@@ -41,10 +45,12 @@ in {
       };
 
       selfhost = {
-        adguard = {
-          enable = true;
-          bind_host = tailscaleIP;
-        };
+        magic_caddy.enable = false;
+
+        # adguard = {
+        #   enable = true;
+        #   bind_host = tailscaleIP;
+        # };
         forgejo = {
           enable = true;
           bind_host = tailscaleIP;