diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..72bdd16
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,494 @@
+{
+ "nodes": {
+ "attic": {
+ "inputs": {
+ "crane": "crane",
+ "flake-compat": "flake-compat",
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs_2",
+ "nixpkgs-stable": "nixpkgs-stable"
+ },
+ "locked": {
+ "lastModified": 1705617092,
+ "narHash": "sha256-n9PK4O4X4S1JkwpkMuYm1wHZYJzRqif8g3RuVIPD+rY=",
+ "owner": "zhaofengli",
+ "repo": "attic",
+ "rev": "fbe252a5c21febbe920c025560cbd63b20e24f3b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "zhaofengli",
+ "ref": "main",
+ "repo": "attic",
+ "type": "github"
+ }
+ },
+ "botcore-v4": {
+ "inputs": {
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1683656302,
+ "narHash": "sha256-I2eu+9/i0ktqNzQwkc0NuczQ2UThCBf8L9xnZ8v3NSM=",
+ "owner": "BotCore-Devs",
+ "repo": "BotCore-v4",
+ "rev": "0e8738ba7df060782df050dc733b0bfc8c499830",
+ "type": "gitlab"
+ },
+ "original": {
+ "owner": "BotCore-Devs",
+ "ref": "staging",
+ "repo": "BotCore-v4",
+ "type": "gitlab"
+ }
+ },
+ "conduit": {
+ "inputs": {
+ "attic": "attic",
+ "crane": "crane_2",
+ "fenix": "fenix",
+ "flake-utils": "flake-utils_2",
+ "nix-filter": "nix-filter",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1706392053,
+ "narHash": "sha256-WoNNQbouUcnTnACid1DPHLIW1NVascNE71SqDSWu10w=",
+ "owner": "girlbossceo",
+ "repo": "conduwuit",
+ "rev": "aa3fd6a47ee8d607ce4fd83f8a802a51fdf9012b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "girlbossceo",
+ "repo": "conduwuit",
+ "type": "github"
+ }
+ },
+ "crane": {
+ "inputs": {
+ "nixpkgs": [
+ "conduit",
+ "attic",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1702918879,
+ "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=",
+ "owner": "ipetkov",
+ "repo": "crane",
+ "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ipetkov",
+ "repo": "crane",
+ "type": "github"
+ }
+ },
+ "crane_2": {
+ "inputs": {
+ "nixpkgs": [
+ "conduit",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1706070683,
+ "narHash": "sha256-iQoXIFviH5QbSKDkWyFJKKUtTcSiCvl1tW18ax+pKfI=",
+ "owner": "CobaltCause",
+ "repo": "crane",
+ "rev": "8060686afabc5b042e8982200cb2cc3fd22cf416",
+ "type": "github"
+ },
+ "original": {
+ "owner": "CobaltCause",
+ "ref": "crimes-for-cross",
+ "repo": "crane",
+ "type": "github"
+ }
+ },
+ "fenix": {
+ "inputs": {
+ "nixpkgs": [
+ "conduit",
+ "nixpkgs"
+ ],
+ "rust-analyzer-src": "rust-analyzer-src"
+ },
+ "locked": {
+ "lastModified": 1706336364,
+ "narHash": "sha256-mJ5i2YIVKv6jTN2+l3oOUUej2NUVjJX/H3bAq6019ks=",
+ "owner": "nix-community",
+ "repo": "fenix",
+ "rev": "eb683549b7d76b12d1a009f888b91b70ed34485f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "fenix",
+ "type": "github"
+ }
+ },
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-compat_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-utils": {
+ "locked": {
+ "lastModified": 1667395993,
+ "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1705309234,
+ "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_3": {
+ "inputs": {
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1705309234,
+ "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "home-manager": {
+ "inputs": {
+ "nixpkgs": "nixpkgs_3"
+ },
+ "locked": {
+ "lastModified": 1706435589,
+ "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=",
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "ref": "master",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
+ "mtxclientSrc": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1705207907,
+ "narHash": "sha256-a9qqKbRyg0uo08jO9Ry+bA0B/qunII2/rooLGJBhDAY=",
+ "owner": "Nheko-reborn",
+ "repo": "mtxclient",
+ "rev": "03bb6fbd665260faec0148b5bb0bfe484e88581a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "Nheko-reborn",
+ "ref": "master",
+ "repo": "mtxclient",
+ "type": "github"
+ }
+ },
+ "nhekoSrc": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1706401145,
+ "narHash": "sha256-2kXefTNtti2WKyCW275NO/PAHUJ2KNamULYXllqBWxY=",
+ "owner": "Nheko-reborn",
+ "repo": "nheko",
+ "rev": "15a3a2731db52862fefe8cb8ac35d92538d1a3b6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "Nheko-reborn",
+ "ref": "master",
+ "repo": "nheko",
+ "type": "github"
+ }
+ },
+ "nix-filter": {
+ "locked": {
+ "lastModified": 1705332318,
+ "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
+ "owner": "numtide",
+ "repo": "nix-filter",
+ "rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "nix-filter",
+ "type": "github"
+ }
+ },
+ "nixos-wsl": {
+ "inputs": {
+ "flake-compat": "flake-compat_2",
+ "flake-utils": "flake-utils_3",
+ "nixpkgs": "nixpkgs_4"
+ },
+ "locked": {
+ "lastModified": 1706071294,
+ "narHash": "sha256-mpt86O5GQxKQoIg4nzKz810PeXjGSEFb4rW+shXbRco=",
+ "owner": "nix-community",
+ "repo": "NixOS-WSL",
+ "rev": "31346e340e828f79be23d9c83ec1674b152f17bc",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "NixOS-WSL",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1683408522,
+ "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-RoryNix": {
+ "locked": {
+ "lastModified": 1706098335,
+ "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-23.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-rory": {
+ "locked": {
+ "lastModified": 0,
+ "narHash": "sha256-ROsiHMIVoUPuyMH0vVt1XNkjCuGsynC04xH0XH0eZh4=",
+ "path": "/Rory-Open-Architecture/nixpkgs",
+ "type": "path"
+ },
+ "original": {
+ "path": "/Rory-Open-Architecture/nixpkgs",
+ "type": "path"
+ }
+ },
+ "nixpkgs-stable": {
+ "locked": {
+ "lastModified": 1702780907,
+ "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-23.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1702539185,
+ "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1706191920,
+ "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
+ "locked": {
+ "lastModified": 1705774713,
+ "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-23.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_5": {
+ "locked": {
+ "lastModified": 1706191920,
+ "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "botcore-v4": "botcore-v4",
+ "conduit": "conduit",
+ "home-manager": "home-manager",
+ "mtxclientSrc": "mtxclientSrc",
+ "nhekoSrc": "nhekoSrc",
+ "nixos-wsl": "nixos-wsl",
+ "nixpkgs": "nixpkgs_5",
+ "nixpkgs-RoryNix": "nixpkgs-RoryNix",
+ "nixpkgs-rory": "nixpkgs-rory"
+ }
+ },
+ "rust-analyzer-src": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1706295183,
+ "narHash": "sha256-VSyMaUsXfjb31B8/uT5cM5qXC1VOHLVsCi/bQuo3O/g=",
+ "owner": "rust-lang",
+ "repo": "rust-analyzer",
+ "rev": "596e5c77cf5b2b660b3ac2ce732fa0596c246d9b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "rust-lang",
+ "ref": "nightly",
+ "repo": "rust-analyzer",
+ "type": "github"
+ }
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/flake.nix b/flake.nix
index d4cb7ea..58d17bd 100755
--- a/flake.nix
+++ b/flake.nix
@@ -7,8 +7,8 @@
#url="path:/Rory-Open-Architecture/nixpkgs";
};
nixpkgs-rory = {
- #url = "path:/Rory-Open-Architecture/nixpkgs";
- url = "github:TheArcaneBrony/nixpkgs/master";
+ url = "path:/Rory-Open-Architecture/nixpkgs";
+ #url = "github:TheArcaneBrony/nixpkgs/master";
};
nixpkgs-RoryNix = {
#url = "github:NixOS/nixpkgs/nixos-23.05";
@@ -21,8 +21,8 @@
url = "github:nix-community/home-manager/master";
};
conduit = {
- url = "gitlab:famedly/conduit";
-
+ #url = "gitlab:famedly/conduit";
+ url = "github:girlbossceo/conduwuit";
# Assuming you have an input for nixpkgs called `nixpkgs`. If you experience
# build failures while using this, try commenting/deleting this line. This
# will probably also require you to always build from source.
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix
index 95e5d40..f98a4e6 100755
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ b/host/Rory-nginx/services/matrix/conduit.nix
@@ -17,11 +17,11 @@
allow_device_name_federation = true;
enable_lightning_bolt = true;
- allow_local_presence = true;
- allow_incoming_presence = true;
- allow_outgoing_presence = true;
- presence_idle_timeout_s = 60;
- presence_offline_timeout_s = 180;
+ #allow_local_presence = true;
+ #allow_incoming_presence = true;
+ #allow_outgoing_presence = true;
+ #presence_idle_timeout_s = 60;
+ #presence_offline_timeout_s = 180;
max_concurrent_requests = 1000;
@@ -31,7 +31,8 @@
allow_check_for_updates = false;
allow_registration = false;
- log = "info,state_res=info";
+ #log = "info,state_res=info";
+ #log = "debug";
};
};
systemd.services.matrix-conduit-reg-token = {
diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
index c7b3e5d..7af0222 100755
--- a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
@@ -26,9 +26,9 @@
locations."~ ^/_matrix/client/(r0|v3)/sync$" = {
proxyPass = "http://generic_workers_upstream$request_uri";
extraConfig = ''
- proxy_read_timeout 300;
- proxy_connect_timeout 300;
- proxy_send_timeout 300;
+ proxy_read_timeout 3600;
+ proxy_connect_timeout 3600;
+ proxy_send_timeout 3600;
'';
};
locations."~ ^/_matrix/client/(api/v1|r0|v3)/events$" = {
diff --git a/rebuild-wsl.sh b/rebuild-wsl.sh
index 7c095a6..b7e66be 100755
--- a/rebuild-wsl.sh
+++ b/rebuild-wsl.sh
@@ -2,9 +2,9 @@
if [ -d "nixpkgs" ]; then
cd nixpkgs
- git remote add upstream https://github.com/NixOS/nixpkgs || git remote set-url upstream https://github.com/NixOS/nixpkgs
- git fetch --all -v
- git rebase upstream/nixos-unstable -v
+# git remote add upstream https://github.com/NixOS/nixpkgs || git remote set-url upstream https://github.com/NixOS/nixpkgs
+# git fetch --all -v
+# git rebase upstream/nixos-unstable -v
cd ..
fi
|
