diff --git a/flake.lock b/flake.lock
index add5bc2..40ce566 100644
--- a/flake.lock
+++ b/flake.lock
@@ -495,11 +495,11 @@
},
"locked": {
"host": "gitlab.computer.surgery",
- "lastModified": 1744671393,
- "narHash": "sha256-W7fgeMoNy9WzrinJymms+1fs+ZPIg2q8TjPafmrHQbQ=",
+ "lastModified": 1745120827,
+ "narHash": "sha256-wF6xQA6TmaTci2RrDpAVJBzSUOp7kj1rgfd0JUt7KCI=",
"owner": "matrix",
"repo": "grapevine-fork",
- "rev": "6cb7896e1740c6fdf0ce2ad9e35563a70a43f579",
+ "rev": "48ecf50973b759eb6ca1940650e074f2b2a925f3",
"type": "gitlab"
},
"original": {
@@ -533,11 +533,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
- "lastModified": 1744735751,
- "narHash": "sha256-OPpfgL3qUIbQdbmp1/ZwnlsuTLooHN4or0EABnZTFRY=",
+ "lastModified": 1745627989,
+ "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "db7738e67a101ad945abbcb447e1310147afaf1b",
+ "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82",
"type": "github"
},
"original": {
@@ -575,7 +575,7 @@
"narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
"rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
"type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz"
+ "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe"
},
"original": {
"type": "tarball",
@@ -585,11 +585,11 @@
"matrixSpecSrc": {
"flake": false,
"locked": {
- "lastModified": 1744738527,
- "narHash": "sha256-n+8FKAvmKtawS+mZ+61b8Jtlc4+feLagmNuAwY/JdXI=",
+ "lastModified": 1745333330,
+ "narHash": "sha256-tJDezgXkwar2UsJq6Zy5ZdD9UmPxvVF4hqXPek5+k8Q=",
"owner": "matrix-org",
"repo": "matrix-spec",
- "rev": "81273df88ee79e2819733ef70dfae9d715954ee5",
+ "rev": "fca171427f11233cb1b82982ac541dd206ebbff8",
"type": "github"
},
"original": {
@@ -723,27 +723,27 @@
},
"nixpkgs-Draupnir": {
"locked": {
- "lastModified": 1742926294,
- "narHash": "sha256-oolpS7uIu6FEsPKzMktoZNlmqeJmYKdgtZCo1pkPfHo=",
+ "lastModified": 1744859637,
+ "narHash": "sha256-aBC43eomBgw1/iJqLC9PlQ8t85orUzto4ONL//J3KVc=",
"owner": "TheArcaneBrony",
"repo": "nixpkgs",
- "rev": "165a75aa70ccd121778eaa7d4f848e47cd453f34",
+ "rev": "eb6abb00725eea8b969dfd6402496c14ff84cf3a",
"type": "github"
},
"original": {
"owner": "TheArcaneBrony",
- "ref": "master",
+ "ref": "module/draupnir",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1744739249,
- "narHash": "sha256-YNVwOB1WpPU3kqi71HkLkqvQq0og6Rjkf3XNprrLZCM=",
+ "lastModified": 1745676824,
+ "narHash": "sha256-B3bvP7K4P+fT3GgmxbMSz7NcZXQ+4a+E4vIU1IJvJ3w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5de293c7d376fcd310a0cd5edee3fa4af7489c34",
+ "rev": "be8287851a1db30cb19f112f6ef61a8ebc44c28e",
"type": "github"
},
"original": {
@@ -771,11 +771,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1744739249,
- "narHash": "sha256-YNVwOB1WpPU3kqi71HkLkqvQq0og6Rjkf3XNprrLZCM=",
+ "lastModified": 1745676824,
+ "narHash": "sha256-B3bvP7K4P+fT3GgmxbMSz7NcZXQ+4a+E4vIU1IJvJ3w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5de293c7d376fcd310a0cd5edee3fa4af7489c34",
+ "rev": "be8287851a1db30cb19f112f6ef61a8ebc44c28e",
"type": "github"
},
"original": {
@@ -835,11 +835,11 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1744463964,
- "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+ "lastModified": 1745526057,
+ "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+ "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
"type": "github"
},
"original": {
@@ -867,11 +867,11 @@
},
"nixpkgs_12": {
"locked": {
- "lastModified": 1744502386,
- "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
+ "lastModified": 1744868846,
+ "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
+ "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
"type": "github"
},
"original": {
@@ -979,11 +979,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1744463964,
- "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+ "lastModified": 1745234285,
+ "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+ "rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
"type": "github"
},
"original": {
@@ -1125,11 +1125,11 @@
"nixpkgs": "nixpkgs_12"
},
"locked": {
- "lastModified": 1744669848,
- "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=",
+ "lastModified": 1745310711,
+ "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "61154300d945f0b147b30d24ddcafa159148026a",
+ "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index d456021..83f1d3e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,7 @@
};
# Draupnir module/package
- nixpkgs-Draupnir.url = "github:TheArcaneBrony/nixpkgs/master";
+ nixpkgs-Draupnir.url = "github:TheArcaneBrony/nixpkgs/module/draupnir";
nixpkgs-keydb.url = "github:NixOS/nixpkgs?rev=e0464e47880a69896f0fb1810f00e0de469f770a";
#MatrixContentFilter.url = "git+file:/home/Rory/git/matrix/MatrixContentFilter?submodules=1";
@@ -133,7 +133,7 @@
nixpkgs.overlays = [
(final: prev: {
matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped;
- draupnir = inputs.nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
+ draupnir = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
keydb = inputs.nixpkgs-keydb.legacyPackages.${pkgs.stdenv.hostPlatform.system}.keydb;
})
];
@@ -184,12 +184,12 @@
matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped.overrideAttrs (old: {
patches = [
./private/synapse-fast-links.patch
- ./private/0001-Hotfix-ignore-rejected-events-in-delayed_events.patch
+ #./private/0001-Hotfix-ignore-rejected-events-in-delayed_events.patch
];
#doCheck = false;
#checkPhase = "";
});
- draupnir = inputs.nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
+ draupnir = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
# .overrideAttrs (old: {
# src = draupnirSrc;
# packageJSON = draupnirSrc + "/package.json";
@@ -439,10 +439,10 @@
packages.nbtexplorer = pkgs.callPackage ./packages/nbtexplorer.nix { };
# untested
- packages.draupnir-main = pkgs.draupnir.overrideAttrs (oldAttrs: {
- src = draupnirSrc;
- version = draupnirSrc.rev;
- });
+ #packages.draupnir-main = pkgs.draupnir.overrideAttrs (oldAttrs: {
+ # src = draupnirSrc;
+ # version = draupnirSrc.rev;
+ #});
packages.redpanda-connect = (pkgs.callPackage ./packages/redpanda-connect/default.nix { });
}
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix
index 9a0aafa..a95d42e 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix
@@ -28,6 +28,8 @@ let
# unstable
"~ ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$"
+ "~ ^/_matrix/client/v3/keys/query$"
+ "~ ^/_matrix/client/v3/room_keys/keys/"
]
++ lib.optionals (cfg.authWorkers == 0) [
"~ ^/_matrix/client/(api/v1|r0|v3|unstable)/login$"
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
index 04bfe7c..29af9fb 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
@@ -28,7 +28,9 @@ let
"~ ^/_matrix/federation/(v1|v2)/exchange_third_party_invite/"
"~ ^/_matrix/federation/(v1|v2)/user/devices/"
"~ ^/_matrix/federation/(v1|v2)/get_groups_publicised$"
+ "~ ^/_matrix/federation/v1/hierarchy/"
"~ ^/_matrix/key/v2/query"
+ "~ ^/_matrix/federation/v1/user/keys/query$"
# extra
"~ ^/_matrix/key/v2/server$"
];
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/sync.nix b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
index 67b63dd..c9f175f 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
@@ -11,6 +11,7 @@ let
"~ ^/_matrix/client/(api/v1|v2_alpha|r0|v3)/events$"
"~ ^/_matrix/client/(api/v1|r0|v3)/initialSync$"
"~ ^/_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync$"
+ "~ ^/_matrix/client/unstable/org.matrix.simplified_msc3575/sync$"
];
federation = [ ];
media = [ ];
diff --git a/host/Rory-ovh/services/nginx/nginx.nix b/host/Rory-ovh/services/nginx/nginx.nix
index ecd125f..3b58796 100755
--- a/host/Rory-ovh/services/nginx/nginx.nix
+++ b/host/Rory-ovh/services/nginx/nginx.nix
@@ -42,13 +42,13 @@ in
# "catgirlsaresexy.com" = serveDir { path = "/data/nginx/html_catgirlsaresexy"; };
# "sugarcanemc.org" = serveDir { path = "/data/nginx/html_sugarcanemc"; };
#
- "siliconheaven.thearcanebrony.net" = serveDir { path = "/data/nginx/html_siliconheaven"; };
- "lfs.thearcanebrony.net" = serveDir { path = "/data/nginx/html_lfs"; };
- "git.thearcanebrony.net" = serveDir { path = "/data/nginx/html_git"; };
- "files.thearcanebrony.net" = serveDir { path = "/data/nginx/html_files"; };
- "spigotav.thearcanebrony.net" = serveDir { path = "/data/nginx/html_spigotav"; };
- "terra.thearcanebrony.net" = serveDir { path = "/data/nginx/html_terrarchive"; };
- "vives.thearcanebrony.net" = serveDir { path = "/data/nginx/html_vives"; };
+ #"siliconheaven.thearcanebrony.net" = serveDir { path = "/data/nginx/html_siliconheaven"; };
+ #"lfs.thearcanebrony.net" = serveDir { path = "/data/nginx/html_lfs"; };
+ #"git.thearcanebrony.net" = serveDir { path = "/data/nginx/html_git"; };
+ #"files.thearcanebrony.net" = serveDir { path = "/data/nginx/html_files"; };
+ #"spigotav.thearcanebrony.net" = serveDir { path = "/data/nginx/html_spigotav"; };
+ #"terra.thearcanebrony.net" = serveDir { path = "/data/nginx/html_terrarchive"; };
+ #"vives.thearcanebrony.net" = serveDir { path = "/data/nginx/html_vives"; };
#
# "git.rory.gay" = serveDir { path = "/data/nginx/html_git"; };
# "wad.rory.gay" = serveDir { path = "/data/nginx/html_wad"; } // {
@@ -56,7 +56,7 @@ in
# };
# "wad-api.rory.gay" = import ./rory.gay/wad-api.nix;
#
- "thearcanebrony.net" = import ./thearcanebrony.net/root.nix;
+ #"thearcanebrony.net" = import ./thearcanebrony.net/root.nix;
# "sentry.thearcanebrony.net" = import ./thearcanebrony.net/sentry.nix;
# "search.thearcanebrony.net" = import ./thearcanebrony.net/search.nix;
#
|
