asdf

4 files changed, 35 insertions, 24 deletions

diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
new file mode 100644
index 0000000..adb07b5
--- /dev/null
+++ b/hosts/ganymede/caddy.nix
@@ -0,0 +1,12 @@
+{
+  services.caddy.virtualHosts."https://web.tail7cca06.ts.net".extraConfig = ''
+    bind tailscale/web
+    root * /var/www/williams_web
+    file_server
+
+    handle_path /papa_stories/* {
+      root * /var/www/papa_stories
+      file_server
+    }
+  '';
+}
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index 6fa3bd1..2a0293c 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -17,16 +17,14 @@
     services = {
       networking = {
         enable = true;
-        networkmanager.enable = true;
-      };
-
-      audio = {
-        enable = true;
-        pulse.enable = true;
+        iwd.enable = true;
+        tailscale.enable = true;
+        sshd.enable = true;
       };
 
       selfhost = {
-        navidrome.enable = true;
+        adguard.enable = true;
+        caddy.enable = true;
       };
     };
   };
diff --git a/hosts/ganymede/minecraft.nix b/hosts/ganymede/minecraft.nix
index a42e9a0..cff5de2 100644
--- a/hosts/ganymede/minecraft.nix
+++ b/hosts/ganymede/minecraft.nix
@@ -1,26 +1,24 @@
 {config, ...}: {
   networking.firewall.allowedUDPPorts = [19132];
-
   virtualisation.oci-containers.backend = "podman";
-  virtualisation.oci-containers.containers = {
-    "Minecraft" = {
-      environment = {
-        EULA = "TRUE";
-        EMIT_SERVER_TELEMETRY = "true";
 
-        SERVER_NAME = "YServer";
-        TZ = config.time.timeZone;
-        VERSION = "1.21.81.2";
-        CONTENT_LOG_FILE_ENABLED = "true";
+  virtualisation.oci-containers.containers."Minecraft" = {
+    environment = {
+      EULA = "TRUE";
+      EMIT_SERVER_TELEMETRY = "true";
 
-        ALLOW_CHEATS = "false";
-        DIFFICULTY = "1";
-      };
-      image = "itzg/minecraft-bedrock-server";
-      ports = ["0.0.0.0:19132:19132/udp"];
-      volumes = ["/srv/minecraft/:/data"];
+      SERVER_NAME = "YServer";
+      TZ = config.time.timeZone;
+      VERSION = "1.21.81.2";
+      CONTENT_LOG_FILE_ENABLED = "true";
 
-      podman.sdnotify = "conmon"; # avoid nasty errors about healthcheck (idk, the service runs fine)
+      ALLOW_CHEATS = "false";
+      DIFFICULTY = "1";
     };
+    image = "itzg/minecraft-bedrock-server";
+    ports = ["0.0.0.0:19132:19132/udp"];
+    volumes = ["/srv/minecraft/:/data"];
+
+    podman.sdnotify = "conmon"; # avoid nasty errors about healthcheck (idk, the service runs fine)
   };
 }
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index e4a72e9..6467059 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -4,8 +4,11 @@
     ./disks.nix
 
     ./iwlwifi.nix
+    ./caddy.nix
   ];
 
+  services.tailscale.extraSetFlags = ["--advertise-exit-node"];
+
   nixpkgs.hostPlatform = "x86_64-linux";
   system.stateVersion = "25.05";
 }