diff --git a/flake.lock b/flake.lock
index e2c8599..2fc7ce9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,29 +32,6 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1717279440,
- "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
- "owner": "zhaofengli",
- "repo": "attic",
- "rev": "717cc95983cdc357bc347d70be20ced21f935843",
- "type": "github"
- },
- "original": {
- "owner": "zhaofengli",
- "ref": "main",
- "repo": "attic",
- "type": "github"
- }
- },
- "attic_3": {
- "inputs": {
- "crane": "crane_5",
- "flake-compat": "flake-compat_8",
- "flake-utils": "flake-utils_6",
- "nixpkgs": "nixpkgs_7",
- "nixpkgs-stable": "nixpkgs-stable_4"
- },
- "locked": {
"lastModified": 1711742460,
"narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",
"owner": "zhaofengli",
@@ -90,81 +67,6 @@
"type": "gitlab"
}
},
- "cachix": {
- "inputs": {
- "devenv": "devenv",
- "flake-compat": "flake-compat_5",
- "nixpkgs": "nixpkgs_5",
- "pre-commit-hooks": "pre-commit-hooks"
- },
- "locked": {
- "lastModified": 1719923519,
- "narHash": "sha256-7Rhljj2fsklFRsu+eq7N683Z9qukmreMEj5C1GqCrSA=",
- "owner": "cachix",
- "repo": "cachix",
- "rev": "4e9e71f78b9500fa6210cf1eaa4d75bdbab777c3",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "master",
- "repo": "cachix",
- "type": "github"
- }
- },
- "cachix_2": {
- "inputs": {
- "devenv": "devenv_2",
- "flake-compat": [
- "conduwuit",
- "cachix",
- "devenv",
- "flake-compat"
- ],
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "devenv",
- "nixpkgs"
- ],
- "pre-commit-hooks": [
- "conduwuit",
- "cachix",
- "devenv",
- "pre-commit-hooks"
- ]
- },
- "locked": {
- "lastModified": 1712055811,
- "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=",
- "owner": "cachix",
- "repo": "cachix",
- "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "cachix",
- "type": "github"
- }
- },
- "complement": {
- "flake": false,
- "locked": {
- "lastModified": 1719903368,
- "narHash": "sha256-PPzgxM4Bir+Zh9FUV/v+RBxEYeJxYVmi/BYo3uqt268=",
- "owner": "matrix-org",
- "repo": "complement",
- "rev": "bc97f1ddc1cd7485faf80c8935ee2641f3e1b57c",
- "type": "github"
- },
- "original": {
- "owner": "matrix-org",
- "ref": "main",
- "repo": "complement",
- "type": "github"
- }
- },
"conduit": {
"inputs": {
"attic": "attic",
@@ -190,34 +92,6 @@
"type": "gitlab"
}
},
- "conduwuit": {
- "inputs": {
- "attic": "attic_2",
- "cachix": "cachix",
- "complement": "complement",
- "crane": "crane_4",
- "fenix": "fenix_2",
- "flake-compat": "flake-compat_7",
- "flake-utils": "flake-utils_5",
- "liburing": "liburing",
- "nix-filter": "nix-filter_2",
- "nixpkgs": "nixpkgs_6",
- "rocksdb": "rocksdb"
- },
- "locked": {
- "lastModified": 1719988456,
- "narHash": "sha256-Xqc5GhiKOgXMyaxqKlKZ6yjiVcwcN6IDrMBl+/+RbaI=",
- "owner": "girlbossceo",
- "repo": "conduwuit",
- "rev": "5edd391e83ac908f009e494996eb6b0591df857f",
- "type": "github"
- },
- "original": {
- "owner": "girlbossceo",
- "repo": "conduwuit",
- "type": "github"
- }
- },
"crane": {
"inputs": {
"nixpkgs": [
@@ -265,50 +139,6 @@
"crane_3": {
"inputs": {
"nixpkgs": [
- "conduwuit",
- "attic",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1717025063,
- "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "repo": "crane",
- "type": "github"
- }
- },
- "crane_4": {
- "inputs": {
- "nixpkgs": [
- "conduwuit",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1716569590,
- "narHash": "sha256-5eDbq8TuXFGGO3mqJFzhUbt5zHVTf5zilQoyW5jnJwo=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "109987da061a1bf452f435f1653c47511587d919",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "ref": "master",
- "repo": "crane",
- "type": "github"
- }
- },
- "crane_5": {
- "inputs": {
- "nixpkgs": [
"grapevine",
"attic",
"nixpkgs"
@@ -328,7 +158,7 @@
"type": "github"
}
},
- "crane_6": {
+ "crane_4": {
"inputs": {
"nixpkgs": [
"grapevine",
@@ -350,75 +180,6 @@
"type": "github"
}
},
- "devenv": {
- "inputs": {
- "cachix": "cachix_2",
- "flake-compat": [
- "conduwuit",
- "cachix",
- "flake-compat"
- ],
- "nix": "nix_2",
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "nixpkgs"
- ],
- "pre-commit-hooks": [
- "conduwuit",
- "cachix",
- "pre-commit-hooks"
- ]
- },
- "locked": {
- "lastModified": 1719759336,
- "narHash": "sha256-3a34VL/QnHprl5gMy9xlx6d8J+iNp+W88Ex8smkgH9M=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "bb32aa986f2f695385e54428d0eaf7d05b31466e",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "devenv",
- "type": "github"
- }
- },
- "devenv_2": {
- "inputs": {
- "flake-compat": [
- "conduwuit",
- "cachix",
- "devenv",
- "cachix",
- "flake-compat"
- ],
- "nix": "nix",
- "nixpkgs": "nixpkgs_4",
- "poetry2nix": "poetry2nix",
- "pre-commit-hooks": [
- "conduwuit",
- "cachix",
- "devenv",
- "cachix",
- "pre-commit-hooks"
- ]
- },
- "locked": {
- "lastModified": 1708704632,
- "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "python-rewrite",
- "repo": "devenv",
- "type": "github"
- }
- },
"fenix": {
"inputs": {
"nixpkgs": [
@@ -444,33 +205,10 @@
"fenix_2": {
"inputs": {
"nixpkgs": [
- "conduwuit",
- "nixpkgs"
- ],
- "rust-analyzer-src": "rust-analyzer-src_2"
- },
- "locked": {
- "lastModified": 1716359173,
- "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=",
- "owner": "nix-community",
- "repo": "fenix",
- "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "main",
- "repo": "fenix",
- "type": "github"
- }
- },
- "fenix_3": {
- "inputs": {
- "nixpkgs": [
"grapevine",
"nixpkgs"
],
- "rust-analyzer-src": "rust-analyzer-src_3"
+ "rust-analyzer-src": "rust-analyzer-src_2"
},
"locked": {
"lastModified": 1716359173,
@@ -503,22 +241,6 @@
"type": "github"
}
},
- "flake-compat_10": {
- "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-compat_2": {
"flake": false,
"locked": {
@@ -554,54 +276,6 @@
"flake-compat_4": {
"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_5": {
- "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-compat_6": {
- "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-compat_7": {
- "flake": false,
- "locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
@@ -616,23 +290,7 @@
"type": "github"
}
},
- "flake-compat_8": {
- "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_9": {
+ "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@@ -644,7 +302,6 @@
},
"original": {
"owner": "edolstra",
- "ref": "master",
"repo": "flake-compat",
"type": "github"
}
@@ -702,24 +359,6 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1689068808,
- "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_5": {
- "inputs": {
- "systems": "systems_3"
- },
- "locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
@@ -734,43 +373,9 @@
"type": "github"
}
},
- "flake-utils_6": {
- "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_7": {
- "inputs": {
- "systems": "systems_4"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "ref": "main",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_8": {
+ "flake-utils_5": {
"inputs": {
- "systems": "systems_5"
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
@@ -786,38 +391,15 @@
"type": "github"
}
},
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "pre-commit-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
"grapevine": {
"inputs": {
- "attic": "attic_3",
- "crane": "crane_6",
- "fenix": "fenix_3",
- "flake-compat": "flake-compat_9",
- "flake-utils": "flake-utils_7",
- "nix-filter": "nix-filter_3",
- "nixpkgs": "nixpkgs_8"
+ "attic": "attic_2",
+ "crane": "crane_4",
+ "fenix": "fenix_2",
+ "flake-compat": "flake-compat_4",
+ "flake-utils": "flake-utils_4",
+ "nix-filter": "nix-filter_2",
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"host": "gitlab.computer.surgery",
@@ -837,7 +419,7 @@
},
"home-manager": {
"inputs": {
- "nixpkgs": "nixpkgs_9"
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1719992360,
@@ -854,23 +436,6 @@
"type": "github"
}
},
- "liburing": {
- "flake": false,
- "locked": {
- "lastModified": 1719025212,
- "narHash": "sha256-kD0yhjNStqC6uFqC1AxBwUpc/HlSFtiKrV+gwDyroDc=",
- "owner": "axboe",
- "repo": "liburing",
- "rev": "7b3245583069bd481190c9da18f22e9fc8c3a805",
- "type": "github"
- },
- "original": {
- "owner": "axboe",
- "ref": "master",
- "repo": "liburing",
- "type": "github"
- }
- },
"mtxclientSrc": {
"flake": false,
"locked": {
@@ -905,34 +470,6 @@
"type": "github"
}
},
- "nix": {
- "inputs": {
- "flake-compat": "flake-compat_4",
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "devenv",
- "cachix",
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-regression": "nixpkgs-regression"
- },
- "locked": {
- "lastModified": 1712911606,
- "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "devenv-2.21",
- "repo": "nix",
- "type": "github"
- }
- },
"nix-filter": {
"locked": {
"lastModified": 1705332318,
@@ -964,84 +501,11 @@
"type": "github"
}
},
- "nix-filter_3": {
- "locked": {
- "lastModified": 1710156097,
- "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
- "owner": "numtide",
- "repo": "nix-filter",
- "rev": "3342559a24e85fc164b295c3444e8a139924675b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "ref": "main",
- "repo": "nix-filter",
- "type": "github"
- }
- },
- "nix-github-actions": {
- "inputs": {
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "devenv",
- "cachix",
- "devenv",
- "poetry2nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1688870561,
- "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
- "owner": "nix-community",
- "repo": "nix-github-actions",
- "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nix-github-actions",
- "type": "github"
- }
- },
- "nix_2": {
- "inputs": {
- "flake-compat": [
- "conduwuit",
- "cachix",
- "devenv",
- "flake-compat"
- ],
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-regression": "nixpkgs-regression_2"
- },
- "locked": {
- "lastModified": 1712911606,
- "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "devenv-2.21",
- "repo": "nix",
- "type": "github"
- }
- },
"nixos-wsl": {
"inputs": {
- "flake-compat": "flake-compat_10",
- "flake-utils": "flake-utils_8",
- "nixpkgs": "nixpkgs_10"
+ "flake-compat": "flake-compat_5",
+ "flake-utils": "flake-utils_5",
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1719220171,
@@ -1089,38 +553,6 @@
"type": "github"
}
},
- "nixpkgs-regression": {
- "locked": {
- "lastModified": 1643052045,
- "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- }
- },
- "nixpkgs-regression_2": {
- "locked": {
- "lastModified": 1643052045,
- "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- }
- },
"nixpkgs-rory": {
"locked": {
"lastModified": 1719309243,
@@ -1171,38 +603,6 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1718811006,
- "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "03d771e513ce90147b65fe922d87d3a0356fc125",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_4": {
- "locked": {
- "lastModified": 1711460390,
- "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_5": {
- "locked": {
"lastModified": 1719663039,
"narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
"owner": "NixOS",
@@ -1217,54 +617,6 @@
"type": "github"
}
},
- "nixpkgs_10": {
- "locked": {
- "lastModified": 1718835956,
- "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_11": {
- "locked": {
- "lastModified": 1719848872,
- "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_12": {
- "locked": {
- "lastModified": 1719468428,
- "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
"lastModified": 1709479366,
@@ -1299,27 +651,27 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1692808169,
- "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=",
+ "lastModified": 1716330097,
+ "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9201b5ff357e781bf014d0330d18555695df7ba8",
+ "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixpkgs-unstable",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1719848872,
- "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
+ "lastModified": 1719506693,
+ "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
+ "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
"type": "github"
},
"original": {
@@ -1331,43 +683,27 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1716330097,
- "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
+ "lastModified": 1718835956,
+ "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
+ "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1711401922,
- "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "07262b18b97000d16a4bdb003418bd2fb067a932",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_8": {
- "locked": {
- "lastModified": 1716330097,
- "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
+ "lastModified": 1719848872,
+ "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
+ "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github"
},
"original": {
@@ -1377,102 +713,32 @@
"type": "github"
}
},
- "nixpkgs_9": {
+ "nixpkgs_8": {
"locked": {
- "lastModified": 1719506693,
- "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
+ "lastModified": 1719468428,
+ "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
+ "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
- "poetry2nix": {
- "inputs": {
- "flake-utils": "flake-utils_4",
- "nix-github-actions": "nix-github-actions",
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "devenv",
- "cachix",
- "devenv",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1692876271,
- "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=",
- "owner": "nix-community",
- "repo": "poetry2nix",
- "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "poetry2nix",
- "type": "github"
- }
- },
- "pre-commit-hooks": {
- "inputs": {
- "flake-compat": "flake-compat_6",
- "gitignore": "gitignore",
- "nixpkgs": [
- "conduwuit",
- "cachix",
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable_3"
- },
- "locked": {
- "lastModified": 1719259945,
- "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
- "rocksdb": {
- "flake": false,
- "locked": {
- "lastModified": 1719949653,
- "narHash": "sha256-DYx7XHH2GEh17GukKhXs6laM6l+eugCmRkF0adpi9wk=",
- "owner": "girlbossceo",
- "repo": "rocksdb",
- "rev": "a935c0273e1ba44eacf88ce3685a9b9831486155",
- "type": "github"
- },
- "original": {
- "owner": "girlbossceo",
- "ref": "v9.3.1",
- "repo": "rocksdb",
- "type": "github"
- }
- },
"root": {
"inputs": {
"botcore-v4": "botcore-v4",
"conduit": "conduit",
- "conduwuit": "conduwuit",
"grapevine": "grapevine",
"home-manager": "home-manager",
"mtxclientSrc": "mtxclientSrc",
"nhekoSrc": "nhekoSrc",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_11",
+ "nixpkgs": "nixpkgs_7",
"nixpkgs-RoryNix": "nixpkgs-RoryNix",
"nixpkgs-rory": "nixpkgs-rory",
"sops-nix": "sops-nix"
@@ -1512,27 +778,10 @@
"type": "github"
}
},
- "rust-analyzer-src_3": {
- "flake": false,
- "locked": {
- "lastModified": 1716107283,
- "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=",
- "owner": "rust-lang",
- "repo": "rust-analyzer",
- "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd",
- "type": "github"
- },
- "original": {
- "owner": "rust-lang",
- "ref": "nightly",
- "repo": "rust-analyzer",
- "type": "github"
- }
- },
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_12",
- "nixpkgs-stable": "nixpkgs-stable_5"
+ "nixpkgs": "nixpkgs_8",
+ "nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1719873517,
@@ -1592,36 +841,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_4": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_5": {
- "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",
diff --git a/flake.nix b/flake.nix
index c6e575a..0f2e89a 100755
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
# Packages
grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery"; # &ref=benjamin/debug-emma-kde-room";
conduit.url = "gitlab:famedly/conduit/next";
- conduwuit.url = "github:girlbossceo/conduwuit";
+ #conduwuit.url = "github:girlbossceo/conduwuit";
nixos-wsl.url = "github:nix-community/NixOS-WSL";
# Own projects
@@ -61,7 +61,7 @@
inherit home-manager;
inherit grapevine;
inherit conduit;
- inherit conduwuit;
+ #inherit conduwuit;
};
};
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 9221781..648d8d5 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -35,6 +35,12 @@
# 127.0.0.1 matrix.rory.gay
# 127.0.0.1 conduit.rory.gay
# '';
+ nat = {
+ enable = true;
+ internalInterfaces = [ "ve-+" "vb-+" ];
+ externalInterface = "ens18";
+ #enableIPv6 = true;
+ };
};
environment.memoryAllocator.provider = "jemalloc";
@@ -54,10 +60,10 @@
conduit = conduit;
};
- containers."conduwuit-throwaway" = import ./services/containers/conduwuit-throwaway/container.nix {
- inherit pkgs lib;
- conduit = conduwuit;
- };
+ #containers."conduwuit-throwaway" = import ./services/containers/conduwuit-throwaway/container.nix {
+ # inherit pkgs lib;
+ # conduit = conduwuit;
+ #};
system.stateVersion = "22.11"; # DO NOT EDIT!
}
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix
deleted file mode 100755
index eb830ab..0000000
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
- services.grapevine = {
- #package = conduit.packages.${pkgs.system}.default;
- enable = true;
- settings = {
- conduit_compat = true;
-# address = "127.0.0.1";
- server_name = "conduit.rory.gay";
-
- listen = [
- {
- type = "tcp";
- address = "127.0.0.1";
- port = 6167;
- }
- ];
-
- database_backend = "rocksdb";
-# rocksdb_optimize_for_spinning_disks = false;
-# rocksdb_max_log_file_size = 33554432;
-
-# allow_public_room_directory_over_federation = true;
-
-# 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;
-
-
-# max_concurrent_requests = 32767;
-# conduit_cache_capacity_modifier = 4000.0; #512.0;
-# db_cache_capacity_mb = 65535.0; #8192.0;
-# rocksdb_parallelism_threads = 12;
-
- #dns settings
-# dns_cache_entries = 65535;
-# dns_min_ttl = 60 * 60 * 12; #12 hours... we expect other servers to backfill in the unlikely case an IP changes.
-# dns_min_ttl_nxdomain = 60 * 60 * 24 * 7; #1 week... we expect backfill to happen must this change...
-# dns_timeout = 15;
-# dns_attempts = 15; #our DNS setup tends to fail
-# query_all_nameservers = true; #needed on our setup...
-
-# federation_timeout = 30;
-# federation_idle_per_host = 8;
-# federation_idle_timeout = 600;
-
-
- allow_check_for_updates = false;
- allow_registration = false;
-
- #log = "info";
- #log_format = "full";
- #log = "debug";
- };
- };
-}
-
diff --git a/host/Rory-nginx/services/matrix/grapevine.nix b/host/Rory-nginx/services/matrix/grapevine.nix
new file mode 100755
index 0000000..700c4bb
--- /dev/null
+++ b/host/Rory-nginx/services/matrix/grapevine.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, lib, ... }:
+
+{
+ services.grapevine = {
+ #package = conduit.packages.${pkgs.system}.default;
+ enable = true;
+ settings = {
+ conduit_compat = true;
+# address = "127.0.0.1";
+ server_name = "conduit.rory.gay";
+
+ listen = [
+ {
+ type = "tcp";
+ address = "127.0.0.1";
+ port = 6167;
+ }
+ ];
+
+ database = {
+ backend = "rocksdb";
+ };
+
+ allow_check_for_updates = false;
+ allow_registration = false;
+
+ #log = "info";
+ #log_format = "full";
+ #log = "debug";
+ };
+ };
+}
+
diff --git a/host/Rory-nginx/services/matrix/root.nix b/host/Rory-nginx/services/matrix/root.nix
index ac4f5ce..3ab3028 100755
--- a/host/Rory-nginx/services/matrix/root.nix
+++ b/host/Rory-nginx/services/matrix/root.nix
@@ -7,7 +7,7 @@
./coturn.nix
./matrix-appservice-discord.nix
./draupnir.nix
- ./conduit.nix
+ ./grapevine.nix
#./matrix-media-gate.nix
];
diff --git a/modules/base.nix b/modules/base.nix
index 5d382aa..a1559fb 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -62,6 +62,12 @@
};
nameservers = [ "1.1.1.1" "1.0.0.1" "8.8.8.8" "8.4.4.8" ];
};
+ environment.etc."resolv.conf".text = ''
+ nameserver 8.8.8.8
+ nameserver 8.4.4.8
+ nameserver 1.1.1.1
+ nameserver 1.0.0.1
+ '';
i18n.defaultLocale = "en_US.UTF-8";
|
