From c84b497b29c10a4aefa8fd3c8742ec139675e5f4 Mon Sep 17 00:00:00 2001
From: intergrav <devin@devins.page>
Date: Tue, 28 Jul 2026 20:40:13 -0400
Subject: [PATCH] simplify

---
 hosts/nixos/bluepill-proxy/default.nix        |  1 +
 hosts/nixos/bluepill-proxy/services/caddy.nix | 19 +------------------
 .../nixos/bluepill-proxy/services/tinysub.nix | 19 +++++++++++++++++++
 package-lock.json                             |  6 ------
 4 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 hosts/nixos/bluepill-proxy/services/tinysub.nix
 delete mode 100644 package-lock.json

diff --git a/hosts/nixos/bluepill-proxy/default.nix b/hosts/nixos/bluepill-proxy/default.nix
index ab69107..71c9aed 100644
--- a/hosts/nixos/bluepill-proxy/default.nix
+++ b/hosts/nixos/bluepill-proxy/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./hardware.nix
     ./services/caddy.nix
+    ./services/tinysub.nix
   ];
 
   networking = {
diff --git a/hosts/nixos/bluepill-proxy/services/caddy.nix b/hosts/nixos/bluepill-proxy/services/caddy.nix
index ab2e184..a5933a8 100644
--- a/hosts/nixos/bluepill-proxy/services/caddy.nix
+++ b/hosts/nixos/bluepill-proxy/services/caddy.nix
@@ -1,12 +1,4 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: let
-  tinysub = inputs.tinysub.packages.${pkgs.system}.default.overrideAttrs (_: {
-    VITE_TINYSUB_NAME = "tinysub.devins.page";
-  });
-in {
+{pkgs, ...}: {
   networking.firewall = {
     allowedTCPPorts = [
       80
@@ -80,15 +72,6 @@ in {
           file_server
         '';
       };
-      "http://tinysub.devins.page, https://tinysub.devins.page" = {
-        extraConfig = ''
-          root ${tinysub}
-          encode
-          @updates path / /index.html /sw.js /manifest.webmanifest
-          header @updates Cache-Control "no-cache"
-          file_server
-        '';
-      };
 
       "matrix.skywardmc.org" = {
         extraConfig = ''
diff --git a/hosts/nixos/bluepill-proxy/services/tinysub.nix b/hosts/nixos/bluepill-proxy/services/tinysub.nix
new file mode 100644
index 0000000..35acc81
--- /dev/null
+++ b/hosts/nixos/bluepill-proxy/services/tinysub.nix
@@ -0,0 +1,19 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  services.caddy.virtualHosts."tinysub.devins.page" = {
+    extraConfig = ''
+      root ${inputs.tinysub.packages.${pkgs.system}.default}
+
+      encode
+
+      @updates path / /index.html /sw.js /manifest.webmanifest
+      header @updates Cache-Control "no-cache"
+      header /manifest.webmanifest Content-Type "application/manifest+json"
+
+      file_server
+    '';
+  };
+}
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 567c249..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "flake",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}
-- 
2.51.2