diff --git a/flake.lock b/flake.lock index f6aa70a..6e27c24 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ ] }, "locked": { - "lastModified": 1770895474, - "narHash": "sha256-JBcrq1Y0uw87VZdYsByVbv+GBuT6ECaCNb9txLX9UuU=", + "lastModified": 1772292445, + "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a494d50d32b5567956b558437ceaa58a380712f7", + "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771587924, - "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=", + "lastModified": 1772153824, + "narHash": "sha256-T65qXmlcD9qFpPTi+mOXsn4dIkO2N8Ls67nqmuzepv0=", "owner": "catppuccin", "repo": "nix", - "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3", + "rev": "4b0f5b7bf7b3eeb484d49524f3c9791864ab9362", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1771866085, - "narHash": "sha256-7OfP7+r5NMzTvP/X5qm7CbM0PR+d7VsQRjJ9VlzGZ70=", + "lastModified": 1772342074, + "narHash": "sha256-EMHTNX4EX7PzRLIvSd3C53SuLNmAb/edaeBzEVPA1Ns=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "6a9a21afb6123729b2f3964a0d19770f8a21f8c6", + "rev": "25f12080cb567a1a78980effbfe8692dbdcbba44", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1771851181, - "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -520,11 +520,11 @@ ] }, "locked": { - "lastModified": 1771756436, - "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -692,11 +692,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1771865886, - "narHash": "sha256-8DlTG/lNBvbXEUmx3jHsizhBoCEqGl6yRRjNRrxlf88=", + "lastModified": 1772319987, + "narHash": "sha256-CWzTcI/f/tEHvJWPR0jU/Rf0razol+uCdFm3TK7QOfo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bc09504ea50901bedf945859bf7bd4c739e1ed38", + "rev": "2928d6af0ad1fa9f950c4ea8394739a468b5e34f", "type": "github" }, "original": { @@ -792,11 +792,11 @@ ] }, "locked": { - "lastModified": 1767983607, - "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=", + "lastModified": 1771866172, + "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2", + "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", "type": "github" }, "original": { @@ -1021,11 +1021,11 @@ ] }, "locked": { - "lastModified": 1770139857, - "narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=", + "lastModified": 1771271487, + "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "9038eec033843c289b06b83557a381a2648d8fa5", + "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", "type": "github" }, "original": { @@ -1175,11 +1175,11 @@ ] }, "locked": { - "lastModified": 1770203293, - "narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=", + "lastModified": 1771606233, + "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98", + "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", "type": "github" }, "original": { @@ -1375,11 +1375,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1771639217, - "narHash": "sha256-eidzES1s+0/Ngkw0fmLGdZ+NSN6P7RwKD0lPLYGqZoU=", + "lastModified": 1772109967, + "narHash": "sha256-0oWZtmVJcI7Mc6nAXf7XM4FHLJv+H1X/8Gh31uJCyJ0=", "owner": "openclaw", "repo": "nix-steipete-tools", - "rev": "95ebfa73f4421144173f7060433c510a7d2d014a", + "rev": "2b97c49e03657af1574aee5a34f57b38fba90035", "type": "github" }, "original": { @@ -1390,11 +1390,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -1406,11 +1406,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -1500,11 +1500,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -1593,11 +1593,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -1649,11 +1649,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1771704400, - "narHash": "sha256-8U9xnN4HdxPfAXAft3lBsArWSv1ZTTxJci1lOA/xpno=", + "lastModified": 1772219256, + "narHash": "sha256-8RH/xcZOEDf2fJ5h/PSXKxmTnsIMV4AXBj3F8ZdJgyw=", "owner": "notashelf", "repo": "nvf", - "rev": "5c38b357da7e8c870350cd1847fb5b2602a28eb0", + "rev": "c07410f1838ce6a44708c49b8ed6fb061babc5ac", "type": "github" }, "original": { @@ -1670,11 +1670,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1771657318, - "narHash": "sha256-xFDNFFN5U9wtMcj1iACmoL6W4PWJeg9C0Pk2+BoY09s=", + "lastModified": 1772348525, + "narHash": "sha256-4FglS6O9oDpIF+kYhikaLUBhZkhzTWF//xlnJK3ZBHY=", "owner": "openclaw", "repo": "nix-openclaw", - "rev": "fbef2087190ccfca375b351cdaad49bcbaea721a", + "rev": "80373ef96a21a15761753ab5dd25fe3d8d680e5a", "type": "github" }, "original": { @@ -1683,6 +1683,31 @@ "type": "github" } }, + "pion-webrtc": { + "inputs": { + "flake-utils": [ + "spacebar", + "flake-utils" + ], + "nixpkgs": [ + "spacebar", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772089711, + "narHash": "sha256-N4XQECQRWDirbf4mrZ0w5eCKPO5o2yNZv4LwW5SS4j0=", + "owner": "spacebarchat", + "repo": "pion-webrtc", + "rev": "d18098fd78687a2864ea8e696596d412889f9250", + "type": "github" + }, + "original": { + "owner": "spacebarchat", + "repo": "pion-webrtc", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1693,11 +1718,11 @@ ] }, "locked": { - "lastModified": 1770726378, - "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", + "lastModified": 1772024342, + "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", + "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", "type": "github" }, "original": { @@ -1754,14 +1779,15 @@ "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" - ] + ], + "pion-webrtc": "pion-webrtc" }, "locked": { - "lastModified": 1771831936, - "narHash": "sha256-mwXntftR14qB1DrxGGMPaZ8wR7k8YwyppEEY0uaZOcU=", + "lastModified": 1772304584, + "narHash": "sha256-IhORc4Xe3uTXuo69FX8uWLAWJNW2oHOgXICD0K5NFXs=", "owner": "spacebarchat", "repo": "server", - "rev": "785f53e7d1f485941e47f13f4558f9568571f9b0", + "rev": "829ada260753e0e45e0ac1db20c8f19afd2420cf", "type": "github" }, "original": { @@ -1948,11 +1974,11 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1771771164, - "narHash": "sha256-BGs42swuu0P3GFNjwdXW96Zb0QabdCp8o5EEwIXyWaM=", + "lastModified": 1772351673, + "narHash": "sha256-Aq2qHTc6cHl8BGvGceRE/U3jxG50l4sR00V2jDPmzbM=", "ref": "refs/heads/master", - "rev": "90c5c1af7fbf275a14a769f8b669369ffecc27b1", - "revCount": 1978, + "rev": "f7c358408ce27f0f196a380d4730a5ae77b44c4d", + "revCount": 1993, "type": "git", "url": "https://tangled.sh/tangled.sh/core" }, @@ -2105,11 +2131,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1771840410, - "narHash": "sha256-fxtvkgQLVhHAjWXPhqahYrVky6KjmS3hwhsb1UX/c/8=", + "lastModified": 1772332855, + "narHash": "sha256-LPNnG/TXua9dSal3Ka+Rj0s34gbkJ4/AhxWBzn87j0E=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "24e003a8ad4ab99cabbba6821bd985bb81dbe656", + "rev": "04e0729057ea01c3336f4751290a20f4ec564727", "type": "github" }, "original": { diff --git a/hosts/server/modules/Caddyfile b/hosts/server/modules/Caddyfile index 71731dc..ab2a1cf 100644 --- a/hosts/server/modules/Caddyfile +++ b/hosts/server/modules/Caddyfile @@ -1,3 +1,11 @@ +@favicon path /favicon.ico +handle @favicon { + root * /lib/system-utdr-assets + rewrite * /tenna.ico + header Content-Type "image/vnd.microsoft.icon" # <-- microslop + file_server +} + @root path / handle @root { header Content-Type "text/plain; charset=utf-8" diff --git a/hosts/server/modules/atproto-pds.nix b/hosts/server/modules/atproto-pds.nix index 5ee554f..8d0b24c 100644 --- a/hosts/server/modules/atproto-pds.nix +++ b/hosts/server/modules/atproto-pds.nix @@ -5,6 +5,10 @@ ... }: +let + systemUtdrAssets = pkgs.callPackage ./system-utdr-assets { }; +in + { # TODO: @@ -19,17 +23,21 @@ PDS_CRAWLERS = "https://bsky.network"; LOG_ENABLED = "true"; PDS_HOSTNAME = "castletown.darkworld.download"; - PDS_VERSION = "\"DELTARUNE TOMMOROW!!!!\""; + PDS_VERSION = "\"That feeling when Deltarune........ tomorrow! :3\""; PDS_DID_PLC_URL = "https://plc.directory"; - PDS_CONTACT_EMAIL_ADDRESS = "ocbwoy3@ocbwoy3.dev"; - PDS_PRIVACY_POLICY_URL = "https://bsky.social/about/support/privacy-policy"; - PDS_TERMS_OF_SERVICE_URL = "https://bsky.social/about/support/tos"; + PDS_CONTACT_EMAIL_ADDRESS = "kris@darkworld.download"; + # PDS_PRIVACY_POLICY_URL = "https://bsky.social/about/support/privacy-policy"; + # PDS_TERMS_OF_SERVICE_URL = "https://bsky.social/about/support/tos"; PDS_ACCEPTING_REPO_IMPORTS = "true"; }; }; # Set host header to `localhost` in tunnel settings otherwise you'll end up wasting countless hours of your life + systemd.tmpfiles.rules = [ + "L+ /lib/system-utdr-assets - - - - ${systemUtdrAssets}/lib/system-utdr-assets" + ]; + services.caddy = { enable = true; globalConfig = '' diff --git a/hosts/server/modules/system-utdr-assets/default.nix b/hosts/server/modules/system-utdr-assets/default.nix new file mode 100644 index 0000000..b92adca --- /dev/null +++ b/hosts/server/modules/system-utdr-assets/default.nix @@ -0,0 +1,21 @@ +{ stdenvNoCC, lib }: + +stdenvNoCC.mkDerivation { + pname = "system-utdr-assets"; + version = "1.0.0"; + + src = ./.; + + installPhase = '' + mkdir -p "$out/lib/system-utdr-assets" + cp "$src/tenna.ico" "$out/lib/system-utdr-assets/tenna.ico" + cp "$src/logo.png" "$out/lib/system-utdr-assets/logo.png" + cp "$src/favicon.png" "$out/lib/system-utdr-assets/favicon.png" + ''; + + meta = with lib; { + description = "System Undertale & Deltarune assets"; + license = licenses.unfree; + maintainers = with maintainers; [ ]; + }; +} diff --git a/hosts/server/modules/system-utdr-assets/favicon.png b/hosts/server/modules/system-utdr-assets/favicon.png new file mode 100644 index 0000000..9d3adbf Binary files /dev/null and b/hosts/server/modules/system-utdr-assets/favicon.png differ diff --git a/hosts/server/modules/system-utdr-assets/logo.png b/hosts/server/modules/system-utdr-assets/logo.png new file mode 100644 index 0000000..85dbb09 Binary files /dev/null and b/hosts/server/modules/system-utdr-assets/logo.png differ diff --git a/hosts/server/modules/system-utdr-assets/tenna.ico b/hosts/server/modules/system-utdr-assets/tenna.ico new file mode 100644 index 0000000..d960b91 Binary files /dev/null and b/hosts/server/modules/system-utdr-assets/tenna.ico differ