diff --git a/flake.lock b/flake.lock index 8453ea7..9b6ae7c 100644 --- a/flake.lock +++ b/flake.lock @@ -331,6 +331,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat_3", @@ -840,7 +858,8 @@ "restray": "restray", "tangled": "tangled", "tg": "tg", - "tinysub": "tinysub" + "tinysub": "tinysub", + "tinysub-se": "tinysub-se" } }, "rust-analyzer-src": { @@ -964,6 +983,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tailwindcss-animated-src": { "flake": false, "locked": { @@ -1061,6 +1095,28 @@ "url": "https://tangled.org/devins.page/tinysub" } }, + "tinysub-se": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1792984470, + "narHash": "sha256-n/2AJiaZDtsZtBTgLArApLZnID8xvXatsFUB0w6vrPo=", + "ref": "experiment/spotify-style", + "rev": "fe2712a958b2042a077306f18cda212f98af8436", + "revCount": 1056, + "type": "git", + "url": "https://tangled.org/devins.page/tinysub" + }, + "original": { + "ref": "experiment/spotify-style", + "type": "git", + "url": "https://tangled.org/devins.page/tinysub" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": "nixpkgs_3" diff --git a/flake.nix b/flake.nix index 2b8fc0a..7fbd741 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,10 @@ url = "git+https://tangled.org/devins.page/tinysub"; inputs.nixpkgs.follows = "nixpkgs"; }; + tinysub-se = { + url = "git+https://tangled.org/devins.page/tinysub?ref=experiment/spotify-style"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: let diff --git a/hosts/bluepill-proxy/services/caddy.nix b/hosts/bluepill-proxy/services/caddy.nix index 5504256..9fe8328 100644 --- a/hosts/bluepill-proxy/services/caddy.nix +++ b/hosts/bluepill-proxy/services/caddy.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, topology, ... @@ -64,6 +65,19 @@ in { file_server ''; }; + "se.tinysub.devins.page" = { + extraConfig = '' + root ${inputs.tinysub-se.packages.${pkgs.stdenv.hostPlatform.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 + ''; + }; "matrix.skywardmc.org" = { extraConfig = '' reverse_proxy http://${bluepill.tailnetAddress}:${toString bluepill.services.matrix}