diff --git a/_sources/generated.json b/_sources/generated.json index de9ec05..7ea0968 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -42,7 +42,7 @@ }, "blog": { "cargoLock": null, - "date": "2026-04-24", + "date": "2026-05-25", "extract": null, "name": "blog", "passthru": null, @@ -52,33 +52,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "9a31eccc91322536b4278f5b037f3c78e184abb3", - "sha256": "sha256-9G10HuIkLvWL2dzwA2FVdq/q17XWGcL+wlMZXyMKkJk=", + "rev": "6dc394fe9d71f8849e97ffae6c61edc2956420b6", + "sha256": "sha256-feVwvbOv72QUzViI/XQqm+1QOUrMJoBGjPYAVz5P5yI=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/endpoint" }, - "version": "9a31eccc91322536b4278f5b037f3c78e184abb3" - }, - "bobbin": { - "cargoLock": null, - "date": "2026-05-20", - "extract": null, - "name": "bobbin", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "692b862ff683ff7689006549883f0a360b1ff80a", - "sha256": "sha256-EJpsS1Hn1g03ewLToIlOONcCvsf8pmsrQtiEhNp7DvM=", - "sparseCheckout": [], - "type": "git", - "url": "https://tangled.org/oyster.cafe/bobbin" - }, - "version": "692b862ff683ff7689006549883f0a360b1ff80a" + "version": "6dc394fe9d71f8849e97ffae6c61edc2956420b6" }, "clickee": { "cargoLock": null, @@ -142,7 +122,7 @@ }, "disko": { "cargoLock": null, - "date": "2026-05-02", + "date": "2026-05-19", "extract": null, "name": "disko", "passthru": null, @@ -154,12 +134,12 @@ "name": null, "owner": "nix-community", "repo": "disko", - "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", - "sha256": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", + "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32", + "sha256": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=", "sparseCheckout": [], "type": "github" }, - "version": "63b4e7e6cf75307c1d26ac3762b886b5b0247267" + "version": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32" }, "drop": { "cargoLock": null, @@ -173,13 +153,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "f85215b1674c55d6885f55b6b2a9e1174a2e9313", - "sha256": "sha256-TUDehZwQIVy0NQvZxYnhXaG28dJesie1u9yFG53tUkg=", + "rev": "2b5466012d716bdd4ba399644e223559a5452eee", + "sha256": "sha256-SYXY3ZvwnyQSNwP10YmuSn5/ucakSmoBLXpfK+jtcrQ=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/juliet.paris/drop" }, - "version": "f85215b1674c55d6885f55b6b2a9e1174a2e9313" + "version": "2b5466012d716bdd4ba399644e223559a5452eee" }, "dysnomia": { "cargoLock": null, @@ -245,7 +225,7 @@ }, "home": { "cargoLock": null, - "date": "2026-05-14", + "date": "2026-05-22", "extract": null, "name": "home", "passthru": null, @@ -257,16 +237,16 @@ "name": null, "owner": "nix-community", "repo": "home-manager", - "rev": "c68d2a24376da3860ef161373d91348b1542356b", - "sha256": "sha256-t7GW8f4So0b+ATPACjTkCy9UesbSidDW3X9w3utVC1A=", + "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34", + "sha256": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=", "sparseCheckout": [], "type": "github" }, - "version": "c68d2a24376da3860ef161373d91348b1542356b" + "version": "509ed3c603349a9d43de9e2ae6613baea6bd5b34" }, "hydrant": { "cargoLock": null, - "date": "2026-05-12", + "date": "2026-05-30", "extract": null, "name": "hydrant", "passthru": null, @@ -276,13 +256,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "a9d29ed76de8ebfdec653081f1d325ea4c1adf56", - "sha256": "sha256-eTdVSI5yt/XsEefY5Jj/QldXv4XalwfUT5loQLHsHMc=", + "rev": "0fd0b621ef7bf4e5bf2636c67f96e84fa3926295", + "sha256": "sha256-nVgbZByDrhyFU0NB/gfHkG8ZW/da1ZwQ/sVtAFHQguI=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/hydrant" }, - "version": "a9d29ed76de8ebfdec653081f1d325ea4c1adf56" + "version": "0fd0b621ef7bf4e5bf2636c67f96e84fa3926295" }, "limbusart": { "cargoLock": null, @@ -306,7 +286,7 @@ }, "moonlight": { "cargoLock": null, - "date": "2026-05-13", + "date": "2026-05-21", "extract": null, "name": "moonlight", "passthru": null, @@ -318,12 +298,12 @@ "name": null, "owner": "moonlight-mod", "repo": "moonlight", - "rev": "2db8e1ac40abf13298e81f093b40a460276b064c", - "sha256": "sha256-jSg8y1wkTLdzZscf3HgXCPoIBfg/aSmTOKdbbJvyfrM=", + "rev": "e01464ab9e0bcd42c1550e74a64f2574c14d2d27", + "sha256": "sha256-eTya6Y7dw/otqohgYZudkqrcI50740jFUTe4Lyd6GKc=", "sparseCheckout": [], "type": "github" }, - "version": "2db8e1ac40abf13298e81f093b40a460276b064c" + "version": "e01464ab9e0bcd42c1550e74a64f2574c14d2d27" }, "ncr": { "cargoLock": null, @@ -347,7 +327,7 @@ }, "nixos-hardware": { "cargoLock": null, - "date": "2026-05-12", + "date": "2026-05-20", "extract": null, "name": "nixos-hardware", "passthru": null, @@ -359,16 +339,16 @@ "name": null, "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9bd7c80d43e258aaa607d83b43661df11444d808", - "sha256": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=", + "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", + "sha256": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", "sparseCheckout": [], "type": "github" }, - "version": "9bd7c80d43e258aaa607d83b43661df11444d808" + "version": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77" }, "nixpkgs-xr": { "cargoLock": null, - "date": "2026-05-14", + "date": "2026-05-23", "extract": null, "name": "nixpkgs-xr", "passthru": null, @@ -380,12 +360,12 @@ "name": null, "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "c6af4789d7801fa243205a8ce9b8e3feffbf42b4", - "sha256": "sha256-PFtYr0cCf7sKE275o5FF/JkA7YonFLZwu1vVvpbVtEo=", + "rev": "8e2ce138c168499500f209a39c618cc4aef45e53", + "sha256": "sha256-yePAKD3X68ExEk+rZDOEXCH1y0bUSTbtOzPaiZfhT+4=", "sparseCheckout": [], "type": "github" }, - "version": "c6af4789d7801fa243205a8ce9b8e3feffbf42b4" + "version": "8e2ce138c168499500f209a39c618cc4aef45e53" }, "nsid-tracker": { "cargoLock": null, @@ -469,7 +449,7 @@ }, "stylix": { "cargoLock": null, - "date": "2026-05-14", + "date": "2026-05-21", "extract": null, "name": "stylix", "passthru": null, @@ -481,16 +461,16 @@ "name": null, "owner": "nix-community", "repo": "stylix", - "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819", - "sha256": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=", + "rev": "c1456cc4ba3c9485e7b4158c909eeca5a752cd59", + "sha256": "sha256-IsDb9erotvx9npI94UDosvMeYQK17p7/vmU2v9batrY=", "sparseCheckout": [], "type": "github" }, - "version": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819" + "version": "c1456cc4ba3c9485e7b4158c909eeca5a752cd59" }, "tangled": { "cargoLock": null, - "date": "2026-05-18", + "date": "2026-05-31", "extract": null, "name": "tangled", "passthru": null, @@ -500,13 +480,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "f165a3ee87200a7704723aabb440251a4d8533a7", - "sha256": "sha256-cbVRx2vdKcNMEsmiu6u3Ao6OkJ03FnqmlX8h2TH4r7s=", + "rev": "f73a82beea33daa6e8a94e32f85a02e8a98f195e", + "sha256": "sha256-DQ4d7fyOMLmkn2jqOovUMajKLKJI16gEXiVYBvRnyak=", "sparseCheckout": [], "type": "git", - "url": "https://tangled.org/tangled.org/core" + "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" }, - "version": "f165a3ee87200a7704723aabb440251a4d8533a7" + "version": "f73a82beea33daa6e8a94e32f85a02e8a98f195e" }, "tangled-sqlite-lib": { "cargoLock": null, @@ -544,7 +524,7 @@ }, "zen-browser": { "cargoLock": null, - "date": "2026-05-12", + "date": "2026-05-22", "extract": null, "name": "zen-browser", "passthru": null, @@ -556,11 +536,11 @@ "name": null, "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "42f41abcef13dc81c85407b57aa1fd1bde46e46c", - "sha256": "sha256-yfxy9aTlIgU2Z36H8cJURgYLgjT4qvFeOzoAC/HXcKM=", + "rev": "5bcdfcef664bf62831dcb4b947004d9c5fbf7201", + "sha256": "sha256-svU6Ro4xiMxMA1KJGwQ/nfKwz3yXE/SONCw2Z1qTXHA=", "sparseCheckout": [], "type": "github" }, - "version": "42f41abcef13dc81c85407b57aa1fd1bde46e46c" + "version": "5bcdfcef664bf62831dcb4b947004d9c5fbf7201" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 3ea94e1..d83f6fa 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -34,31 +34,17 @@ }; blog = { pname = "blog"; - version = "9a31eccc91322536b4278f5b037f3c78e184abb3"; + version = "6dc394fe9d71f8849e97ffae6c61edc2956420b6"; src = fetchgit { url = "https://tangled.org/@ptr.pet/endpoint"; - rev = "9a31eccc91322536b4278f5b037f3c78e184abb3"; + rev = "6dc394fe9d71f8849e97ffae6c61edc2956420b6"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-9G10HuIkLvWL2dzwA2FVdq/q17XWGcL+wlMZXyMKkJk="; + sha256 = "sha256-feVwvbOv72QUzViI/XQqm+1QOUrMJoBGjPYAVz5P5yI="; }; - date = "2026-04-24"; - }; - bobbin = { - pname = "bobbin"; - version = "692b862ff683ff7689006549883f0a360b1ff80a"; - src = fetchgit { - url = "https://tangled.org/oyster.cafe/bobbin"; - rev = "692b862ff683ff7689006549883f0a360b1ff80a"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ ]; - sha256 = "sha256-EJpsS1Hn1g03ewLToIlOONcCvsf8pmsrQtiEhNp7DvM="; - }; - date = "2026-05-20"; + date = "2026-05-25"; }; clickee = { pname = "clickee"; @@ -104,27 +90,27 @@ }; disko = { pname = "disko"; - version = "63b4e7e6cf75307c1d26ac3762b886b5b0247267"; + version = "65fb947964bd44fc0008faf77d1fcb7a9f40bb32"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; - rev = "63b4e7e6cf75307c1d26ac3762b886b5b0247267"; + rev = "65fb947964bd44fc0008faf77d1fcb7a9f40bb32"; fetchSubmodules = false; - sha256 = "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo="; + sha256 = "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs="; }; - date = "2026-05-02"; + date = "2026-05-19"; }; drop = { pname = "drop"; - version = "f85215b1674c55d6885f55b6b2a9e1174a2e9313"; + version = "2b5466012d716bdd4ba399644e223559a5452eee"; src = fetchgit { url = "https://tangled.org/juliet.paris/drop"; - rev = "f85215b1674c55d6885f55b6b2a9e1174a2e9313"; + rev = "2b5466012d716bdd4ba399644e223559a5452eee"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-TUDehZwQIVy0NQvZxYnhXaG28dJesie1u9yFG53tUkg="; + sha256 = "sha256-SYXY3ZvwnyQSNwP10YmuSn5/ucakSmoBLXpfK+jtcrQ="; }; date = "2026-05-20"; }; @@ -168,29 +154,29 @@ }; home = { pname = "home"; - version = "c68d2a24376da3860ef161373d91348b1542356b"; + version = "509ed3c603349a9d43de9e2ae6613baea6bd5b34"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "c68d2a24376da3860ef161373d91348b1542356b"; + rev = "509ed3c603349a9d43de9e2ae6613baea6bd5b34"; fetchSubmodules = false; - sha256 = "sha256-t7GW8f4So0b+ATPACjTkCy9UesbSidDW3X9w3utVC1A="; + sha256 = "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ="; }; - date = "2026-05-14"; + date = "2026-05-22"; }; hydrant = { pname = "hydrant"; - version = "a9d29ed76de8ebfdec653081f1d325ea4c1adf56"; + version = "0fd0b621ef7bf4e5bf2636c67f96e84fa3926295"; src = fetchgit { url = "https://tangled.org/@ptr.pet/hydrant"; - rev = "a9d29ed76de8ebfdec653081f1d325ea4c1adf56"; + rev = "0fd0b621ef7bf4e5bf2636c67f96e84fa3926295"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-eTdVSI5yt/XsEefY5Jj/QldXv4XalwfUT5loQLHsHMc="; + sha256 = "sha256-nVgbZByDrhyFU0NB/gfHkG8ZW/da1ZwQ/sVtAFHQguI="; }; - date = "2026-05-12"; + date = "2026-05-30"; }; limbusart = { pname = "limbusart"; @@ -208,15 +194,15 @@ }; moonlight = { pname = "moonlight"; - version = "2db8e1ac40abf13298e81f093b40a460276b064c"; + version = "e01464ab9e0bcd42c1550e74a64f2574c14d2d27"; src = fetchFromGitHub { owner = "moonlight-mod"; repo = "moonlight"; - rev = "2db8e1ac40abf13298e81f093b40a460276b064c"; + rev = "e01464ab9e0bcd42c1550e74a64f2574c14d2d27"; fetchSubmodules = false; - sha256 = "sha256-jSg8y1wkTLdzZscf3HgXCPoIBfg/aSmTOKdbbJvyfrM="; + sha256 = "sha256-eTya6Y7dw/otqohgYZudkqrcI50740jFUTe4Lyd6GKc="; }; - date = "2026-05-13"; + date = "2026-05-21"; }; ncr = { pname = "ncr"; @@ -234,27 +220,27 @@ }; nixos-hardware = { pname = "nixos-hardware"; - version = "9bd7c80d43e258aaa607d83b43661df11444d808"; + version = "c97bc4d15bd3473dd095e8e8ba57330ab1943a77"; src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-hardware"; - rev = "9bd7c80d43e258aaa607d83b43661df11444d808"; + rev = "c97bc4d15bd3473dd095e8e8ba57330ab1943a77"; fetchSubmodules = false; - sha256 = "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c="; + sha256 = "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU="; }; - date = "2026-05-12"; + date = "2026-05-20"; }; nixpkgs-xr = { pname = "nixpkgs-xr"; - version = "c6af4789d7801fa243205a8ce9b8e3feffbf42b4"; + version = "8e2ce138c168499500f209a39c618cc4aef45e53"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixpkgs-xr"; - rev = "c6af4789d7801fa243205a8ce9b8e3feffbf42b4"; + rev = "8e2ce138c168499500f209a39c618cc4aef45e53"; fetchSubmodules = false; - sha256 = "sha256-PFtYr0cCf7sKE275o5FF/JkA7YonFLZwu1vVvpbVtEo="; + sha256 = "sha256-yePAKD3X68ExEk+rZDOEXCH1y0bUSTbtOzPaiZfhT+4="; }; - date = "2026-05-14"; + date = "2026-05-23"; }; nsid-tracker = { pname = "nsid-tracker"; @@ -314,29 +300,29 @@ }; stylix = { pname = "stylix"; - version = "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819"; + version = "c1456cc4ba3c9485e7b4158c909eeca5a752cd59"; src = fetchFromGitHub { owner = "nix-community"; repo = "stylix"; - rev = "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819"; + rev = "c1456cc4ba3c9485e7b4158c909eeca5a752cd59"; fetchSubmodules = false; - sha256 = "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo="; + sha256 = "sha256-IsDb9erotvx9npI94UDosvMeYQK17p7/vmU2v9batrY="; }; - date = "2026-05-14"; + date = "2026-05-21"; }; tangled = { pname = "tangled"; - version = "f165a3ee87200a7704723aabb440251a4d8533a7"; + version = "f73a82beea33daa6e8a94e32f85a02e8a98f195e"; src = fetchgit { - url = "https://tangled.org/tangled.org/core"; - rev = "f165a3ee87200a7704723aabb440251a4d8533a7"; + url = "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is"; + rev = "f73a82beea33daa6e8a94e32f85a02e8a98f195e"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-cbVRx2vdKcNMEsmiu6u3Ao6OkJ03FnqmlX8h2TH4r7s="; + sha256 = "sha256-DQ4d7fyOMLmkn2jqOovUMajKLKJI16gEXiVYBvRnyak="; }; - date = "2026-05-18"; + date = "2026-05-31"; }; tangled-sqlite-lib = { pname = "tangled-sqlite-lib"; @@ -362,14 +348,14 @@ }; zen-browser = { pname = "zen-browser"; - version = "42f41abcef13dc81c85407b57aa1fd1bde46e46c"; + version = "5bcdfcef664bf62831dcb4b947004d9c5fbf7201"; src = fetchFromGitHub { owner = "0xc000022070"; repo = "zen-browser-flake"; - rev = "42f41abcef13dc81c85407b57aa1fd1bde46e46c"; + rev = "5bcdfcef664bf62831dcb4b947004d9c5fbf7201"; fetchSubmodules = false; - sha256 = "sha256-yfxy9aTlIgU2Z36H8cJURgYLgjT4qvFeOzoAC/HXcKM="; + sha256 = "sha256-svU6Ro4xiMxMA1KJGwQ/nfKwz3yXE/SONCw2Z1qTXHA="; }; - date = "2026-05-12"; + date = "2026-05-22"; }; } diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index 69cae52..9322c7e 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -138,6 +138,17 @@ D( IGNORE_ACME(), ); +D( + "rapeable.dog", + REG_NONE, + DnsProvider(DSP_PRIMARY), + // TRIMOUNTS("@"), + TXT("@", "v=spf1 -all"), + TXT("_dmarc", "v=DMARC1; p=reject;"), + TXT("_atproto", "did=did:plc:dumbmutt4po52ept2tczimje", TTL(60)), + IGNORE_ACME(), +); + var EMAIL_TTL = function () { return TTL(86400); }; D( diff --git a/flake.lock b/flake.lock index e69cf1d..bac42dc 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-rNDJzV2JTV5SUTwv1cgKZYMdyoUYU9/YfegSaUf3QfY=", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "lastModified": 1779357205, + "narHash": "sha256-STlbE8L45Uutxaffotwjqp+nX6g6jqc/mnx/7DxODyA=", + "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre995699.da5ad661ba4e/nixexprs.tar.xz?lastModified=1778443072&rev=da5ad661ba4e5ef59ba743f0d112cbc30e474f32" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1002845.f83fc3c307e7/nixexprs.tar.xz?lastModified=1779357205&rev=f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1" }, "original": { "type": "tarball", diff --git a/hosts/chernobog/default.nix b/hosts/chernobog/default.nix index 2b0e631..871be28 100644 --- a/hosts/chernobog/default.nix +++ b/hosts/chernobog/default.nix @@ -79,5 +79,9 @@ virtualisation.podman.enable = true; + programs.nix-ld = { + enable = true; + }; + system.stateVersion = "25.05"; } diff --git a/hosts/trimounts/modules/drop.nix b/hosts/trimounts/modules/drop.nix index a4ccb1e..ef7d8ea 100644 --- a/hosts/trimounts/modules/drop.nix +++ b/hosts/trimounts/modules/drop.nix @@ -14,6 +14,7 @@ after = ["network.target"]; environment = { PORT = "8663"; + MAX_FILE_SIZE = "200000000"; }; serviceConfig = { Type = "simple"; @@ -39,6 +40,6 @@ quic = true; kTLS = true; locations."/".proxyPass = "http://127.0.0.1:8663"; - extraConfig = "client_max_body_size 100M;"; + extraConfig = "client_max_body_size 200M;"; }; } \ No newline at end of file diff --git a/hosts/trimounts/modules/wisp-random.nix b/hosts/trimounts/modules/wisp-random.nix index acacc0b..228ab9f 100644 --- a/hosts/trimounts/modules/wisp-random.nix +++ b/hosts/trimounts/modules/wisp-random.nix @@ -5,6 +5,10 @@ let rootDomain = "ptr.pet"; domain = "wisp-random.${rootDomain}"; + + hydrantPkg = terra.hydrant.overrideAttrs (old: { + doCheck = false; + }); in { users.users.random-wisp-place = { isSystemUser = true; @@ -20,7 +24,7 @@ in { environment = { PORT = toString port; WISP_API_URL = "https://wisp.place"; - HYDRANT_BIN = "${terra.hydrant}/bin/hydrant"; + HYDRANT_BIN = "${hydrantPkg}/bin/hydrant"; # CURSOR = "0"; }; diff --git a/hosts/volsinii/modules/bobbin.nix b/hosts/volsinii/modules/bobbin.nix index cea50c7..0de23e5 100644 --- a/hosts/volsinii/modules/bobbin.nix +++ b/hosts/volsinii/modules/bobbin.nix @@ -71,7 +71,7 @@ in systemd.services.bobbin = { description = "bobbin tangled graph index"; - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; after = [ "network-online.target" "hydrant-bobbin.service" diff --git a/hosts/volsinii/modules/relay.nix b/hosts/volsinii/modules/relay.nix index 6872ac7..4b5fe88 100644 --- a/hosts/volsinii/modules/relay.nix +++ b/hosts/volsinii/modules/relay.nix @@ -3,7 +3,7 @@ let port = "13579"; pkg = terra.hydrant.overrideAttrs (old: { cargoBuildNoDefaultFeatures = true; - cargoBuildFeatures = [ "relay" ]; + cargoBuildFeatures = ["relay" "jetstream"]; doCheck = false; }); in @@ -70,6 +70,10 @@ in quic = true; kTLS = true; locations."=/".proxyPass = "http://localhost:${port}"; + locations."/subscribe" = { + proxyPass = "http://localhost:${port}"; + proxyWebsockets = true; + }; locations."/xrpc" = { proxyPass = "http://localhost:${port}"; proxyWebsockets = true; diff --git a/hosts/volsinii/modules/slingshot.nix b/hosts/volsinii/modules/slingshot.nix index 2016f1f..c3c1f24 100644 --- a/hosts/volsinii/modules/slingshot.nix +++ b/hosts/volsinii/modules/slingshot.nix @@ -6,6 +6,7 @@ let domain = "sl.klbr.net"; port = 8081; + relayPort = 13579; in { users.users.slingshot = { @@ -28,7 +29,7 @@ in Type = "simple"; ExecStart = '' ${terra.slingshot}/bin/slingshot \ - --jetstream wss://jetstream1.us-east.fire.hose.cam/subscribe \ + --jetstream ws://127.0.0.1:${toString relayPort}/subscribe \ --cache-dir /var/lib/slingshot/cache \ --bind 127.0.0.1:${toString port} \ --record-cache-memory-mb 1024 \ diff --git a/nvfetcher.toml b/nvfetcher.toml index 0fbc9e1..654cf72 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -78,15 +78,11 @@ fetch.git = "https://tangled.org/@ptr.pet/slopview" src.git = "https://tangled.org/juliet.paris/drop" fetch.git = "https://tangled.org/juliet.paris/drop" -[bobbin] -src.git = "https://tangled.org/oyster.cafe/bobbin" -fetch.git = "https://tangled.org/oyster.cafe/bobbin" - ## TANGLED ## [tangled] -src.git = "https://tangled.org/tangled.org/core" -fetch.git = "https://tangled.org/tangled.org/core" +src.git = "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" +fetch.git = "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" [tangled-sqlite-lib] src.manual = "3450100" diff --git a/pkgs-set/overlays/feishin.nix b/pkgs-set/overlays/feishin.nix deleted file mode 100644 index eeaf53c..0000000 --- a/pkgs-set/overlays/feishin.nix +++ /dev/null @@ -1,10 +0,0 @@ -final: prev: let - nixpkgs = final.fetchFromGitHub { - owner = "nixos"; - repo = "nixpkgs"; - rev = "704f35db2a9090fb91098735e337722e2921e806"; - hash = "sha256-U4eCiVMdkbVVaxepH76mDF6vTQ6qLLT8BYyS0G34i4s="; - }; -in { - feishin = prev.callPackage "${nixpkgs}/pkgs/by-name/fe/feishin/package.nix" {}; -} diff --git a/pkgs-set/overlays/nixpkgs-xr.nix b/pkgs-set/overlays/nixpkgs-xr.nix index 9b0e11e..51ae3f3 100644 --- a/pkgs-set/overlays/nixpkgs-xr.nix +++ b/pkgs-set/overlays/nixpkgs-xr.nix @@ -1,3 +1,3 @@ {inputs, ...}: final: prev: ((import inputs.nixpkgs-xr).overlays.default final prev) -# // { wivrn = prev.wivrn; } +// { wivrn = prev.wivrn; } diff --git a/pkgs-set/pkgs/antigravity.nix/default.nix b/pkgs-set/pkgs/antigravity.nix/default.nix deleted file mode 100644 index 92116a7..0000000 --- a/pkgs-set/pkgs/antigravity.nix/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - lib, - stdenv, - buildVscode, - fetchurl, - jq, - writeShellScript, - coreutils, - commandLineArgs ? "", - useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin, - ... -}: - -let - inherit (stdenv) hostPlatform; - information = (lib.importJSON ./information.json); - source = - information.sources."${hostPlatform.system}" - or (throw "antigravity: unsupported system ${hostPlatform.system}"); -in -(buildVscode { - inherit commandLineArgs useVSCodeRipgrep; - inherit (information) version vscodeVersion; - pname = "antigravity"; - - executableName = "antigravity"; - longName = "Antigravity"; - shortName = "Antigravity"; - libraryName = "antigravity"; - iconName = "antigravity"; - - src = fetchurl { inherit (source) url sha256; }; - - sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity"; - - tests = { }; - updateScript = ./update.js; - - # When running inside an FHS environment, try linking Google Chrome or Chromium - # to the hardcoded Playwright search path: /opt/google/chrome/chrome - customizeFHSEnv = - args: - args - // { - extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ]; - extraBuildCommands = (args.extraBuildCommands or "") + '' - mkdir -p "$out/opt/google/chrome" - ''; - runScript = writeShellScript "antigravity-wrapper" '' - for candidate in google-chrome-stable google-chrome chromium-browser chromium; do - if target=$(command -v "$candidate"); then - ${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome - break - fi - done - exec ${args.runScript} "$@" - ''; - }; - - meta = { - mainProgram = "antigravity"; - description = "Agentic development platform, evolving the IDE into the agent-first era"; - homepage = "https://antigravity.google"; - downloadPage = "https://antigravity.google/download"; - changelog = "https://antigravity.google/changelog"; - license = lib.licenses.unfree; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - maintainers = with lib.maintainers; [ - xiaoxiangmoe - Zaczero - ]; - }; -}).overrideAttrs - (oldAttrs: { - # Disable update checks - nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ jq ]; - postPatch = (oldAttrs.postPatch or "") + '' - productJson="${ - if stdenv.hostPlatform.isDarwin then "Contents/Resources" else "resources" - }/app/product.json" - data=$(jq 'del(.updateUrl)' "$productJson") - echo "$data" > "$productJson" - ''; - }) \ No newline at end of file diff --git a/pkgs-set/pkgs/antigravity.nix/information.json b/pkgs-set/pkgs/antigravity.nix/information.json deleted file mode 100644 index 79cbe4f..0000000 --- a/pkgs-set/pkgs/antigravity.nix/information.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.23.2", - "vscodeVersion": "1.107.0", - "sources": { - "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-x64/Antigravity.tar.gz", - "sha256": "5232a4048ff4fa15685d9a981ba4fba573e297f3efc9b76f638e794baf775725" - }, - "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz", - "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1" - }, - "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip", - "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357" - }, - "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip", - "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8" - } - } -} diff --git a/pkgs-set/pkgs/antigravity.nix/update.js b/pkgs-set/pkgs/antigravity.nix/update.js deleted file mode 100755 index 58b8827..0000000 --- a/pkgs-set/pkgs/antigravity.nix/update.js +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env nix -/* -#!nix shell --ignore-environment .#cacert .#nodejs --command node -*/ -// @ts-check -import assert from "node:assert/strict"; -import * as fs from "node:fs"; -import * as path from "node:path"; -/** - * @typedef {object} UpdateInfo - * @property {number} timestamp Unix timestamp in seconds, example: 1763468493 - * @property {string} productVersion VSCode OSS version, example: "1.104.0" - * @property {string} sha256hash SHA256 hash of the download file, example: "8eb01462dc4f26aba45be4992bda0b145d1ec210c63a6272578af27e59f23bef" - * @property {string} url Download URL, example: "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/linux-arm/Antigravity.tar.gz", "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/darwin-x64/Antigravity.zip" - */ -/** @typedef {"x86_64-linux" | "aarch64-linux" | "x86_64-darwin" | "aarch64-darwin"} Platform */ -/** @typedef {{ version: string; vscodeVersion: string; sources: Record }} Information */ - -let version = ""; -let vscodeVersion = ""; -async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64" | "darwin"} */ targetSystem) { - /** @type {UpdateInfo} */ - const latestInfo = await (await fetch(`https://antigravity-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json(); - const newVersion = /\/antigravity\/stable\/([\d.]+)-[\d]+/.exec(latestInfo.url)?.[1] ?? ""; // Current API lack version field now, we need to parse it from the URL temporarily. - assert(version === '' || version === newVersion, `Version mismatch: ${version}(linux-x64) != ${newVersion}(${targetSystem})`); - version = newVersion; - assert(vscodeVersion === '' || vscodeVersion === latestInfo.productVersion, `VSCode version mismatch: ${vscodeVersion}(linux-x64) != ${latestInfo.productVersion}(${targetSystem})`); - vscodeVersion = latestInfo.productVersion; - return { - url: latestInfo.url, - sha256: latestInfo.sha256hash, - }; -} -/** @type {Information['sources']} */ -const sources = { - "x86_64-linux": await getLatestInformation("linux-x64"), - "aarch64-linux": await getLatestInformation("linux-arm64"), - "x86_64-darwin": await getLatestInformation("darwin"), - "aarch64-darwin": await getLatestInformation("darwin-arm64"), -}; -/** @type {Information} */ -const information = { version, vscodeVersion, sources }; -fs.writeFileSync(path.join(import.meta.dirname, "./information.json"), JSON.stringify(information, null, 2) + "\n", "utf-8"); -console.log(`[update] Updating Antigravity complete, version: ${version}, vscodeVersion: ${vscodeVersion}`); \ No newline at end of file diff --git a/pkgs-set/pkgs/bobbin.nix b/pkgs-set/pkgs/bobbin.nix index 229ec44..55340b3 100644 --- a/pkgs-set/pkgs/bobbin.nix +++ b/pkgs-set/pkgs/bobbin.nix @@ -1,23 +1,17 @@ { lib, - inputs, rustPlatform, + inputs, ... }: - rustPlatform.buildRustPackage { pname = "bobbin"; version = "main"; - - src = inputs.bobbin; - - cargoHash = "sha256-Ojy5LZvyM3J+0zwMn96G/K2XXpj5ASM7ho5Y3Xj8Apg="; - - postPatch = '' - substituteInPlace Cargo.toml \ - --replace-fail 'rust-version = "1.95"' 'rust-version = "1.94"' - ''; - + + src = inputs.tangled; + + cargoHash = "sha256-uiD2U7MqfufoBJZa3oKsyhnBk4mCXo42lc18aVSLJiM="; + cargoBuildFlags = [ "--bin" "bobbin" @@ -25,16 +19,21 @@ rustPlatform.buildRustPackage { "bobbin" ]; + postUnpack = '' + substituteInPlace $sourceRoot/Cargo.toml \ + --replace-fail 'rust-version = "1.96"' 'rust-version = "1.95"' + ''; + preBuild = '' export BOBBIN_LEXICONS_DIR=${inputs.tangled}/lexicons ''; - + doCheck = false; - + meta = { - description = "Tangled graph edge index and XRPC service"; + description = "tangled appview"; homepage = "https://tangled.org/oyster.cafe/bobbin"; license = lib.licenses.mit; mainProgram = "bobbin"; }; -} +} \ No newline at end of file diff --git a/pkgs-set/pkgs/helium.nix b/pkgs-set/pkgs/helium.nix index b094451..3dab924 100644 --- a/pkgs-set/pkgs/helium.nix +++ b/pkgs-set/pkgs/helium.nix @@ -5,7 +5,7 @@ }: pkgs.appimageTools.wrapType2 rec { pname = "helium"; - version = "0.12.3.1"; + version = "0.12.4.1"; src = let platformMap = { @@ -16,7 +16,7 @@ pkgs.appimageTools.wrapType2 rec { platform = platformMap.${pkgs.system}; hashes = { - "x86_64-linux" = "sha256-VnOhzhAulvFNBB/0AD1d+K/TzfFL9Zwtk/vcm5vWl+I="; + "x86_64-linux" = "sha256-OgS8HkLBseFrEhNFJxMwp1bg0gzPdfY1VaySAAp7vq0="; "aarch64-linux" = ""; }; diff --git a/users/mayer/default.nix b/users/mayer/default.nix index 63b973b..f461163 100644 --- a/users/mayer/default.nix +++ b/users/mayer/default.nix @@ -183,7 +183,6 @@ in ]) ++ [ terra.headroom-ai terra.helium - terra.antigravity # terra.pi-coding-agent terra.iloader terra.lmstudio diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix index 4b825d3..290f58e 100644 --- a/users/modules/discord/default.nix +++ b/users/modules/discord/default.nix @@ -5,7 +5,7 @@ }: let pkg = pkgs.discord.override { - withMoonlight = false; + withMoonlight = true; inherit (terra) moonlight; withOpenASAR = false; withTTS = false; diff --git a/users/modules/niri/config.kdl b/users/modules/niri/config.kdl index 8f2878a..1979111 100644 --- a/users/modules/niri/config.kdl +++ b/users/modules/niri/config.kdl @@ -113,7 +113,8 @@ layout { struts { } } -spawn-at-startup "swaybg" "-i" "%%wallpaper%%" +spawn-at-startup "mpvpaper" "-o" "'--loop'" "-p" "all" "~/wallpaper.mp4" +// spawn-at-startup "swaybg" "-i" "%%wallpaper%%" // spawn-at-startup "systemctl" "--user" "start" "gsr-replay.service" hotkey-overlay { diff --git a/users/modules/niri/default.nix b/users/modules/niri/default.nix index 7124b8f..b314d4f 100644 --- a/users/modules/niri/default.nix +++ b/users/modules/niri/default.nix @@ -15,7 +15,7 @@ in ../clipman ]; - home.packages = with pkgs; [file libnotify clipman niri xwayland-satellite brightnessctl swaybg slurp jq]; + home.packages = with pkgs; [file libnotify clipman niri xwayland-satellite brightnessctl swaybg slurp jq mpvpaper]; xdg.configFile."niri/config.kdl".text = let replace = {