summary refs log tree commit diff
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2026-01-07 14:50:27 +0000
committerRory& <root@rory.gay>2026-01-07 14:50:27 +0000
commit0bfd4c172ca0b33334d06de32155bfcf54a75650 (patch)
tree23416537a819730c1599aa05590ea20df7f31d03
parentRider on the server (diff)
downloadRory-Open-Architecture-master.tar.xz
Server updates HEAD master
-rw-r--r--flake.lock131
-rwxr-xr-xflake.nix1
-rw-r--r--host/Rory-ovh/services/cgit.nix1
-rw-r--r--host/Rory-ovh/services/matrix/ooye.nix1
-rwxr-xr-xmodules/base.nix1
5 files changed, 69 insertions, 66 deletions
diff --git a/flake.lock b/flake.lock

index 2c7a726..16dcb07 100644 --- a/flake.lock +++ b/flake.lock
@@ -132,11 +132,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1766440187, - "narHash": "sha256-LjN8/E/+S4lGcxkM+mq+tTLk+OoPS+gvNFR7DJ809L0=", + "lastModified": 1767125279, + "narHash": "sha256-Ar3nAGDXGoQaY2hgVoXqNEEyjDV8cf2ciZB9FoJXLDw=", "owner": "famedly", "repo": "conduit", - "rev": "3db42bd011f900097af72af0bc1669d58e5d8340", + "rev": "346913268f5fd690ae11124df3906223d3974924", "type": "gitlab" }, "original": { @@ -300,11 +300,11 @@ "ffmpegSrc": { "flake": false, "locked": { - "lastModified": 1767538170, - "narHash": "sha256-EwIH4KF57i1yQOiWGwOa50PULBlv1VWksQelyJnR5M0=", + "lastModified": 1767794829, + "narHash": "sha256-ObZo1uMCyzMhYzZgcf6P7hAvnODgMpCpZW/Ef0bdL7c=", "ref": "refs/heads/master", - "rev": "66f7e9db714a4cb12431c9e20d20207dcceacc55", - "revCount": 122363, + "rev": "41342aea221c540ad7def17893ea2d94fab4f5aa", + "revCount": 122382, "type": "git", "url": "https://git.ffmpeg.org/ffmpeg.git" }, @@ -413,15 +413,15 @@ "flake-compat_7": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -642,17 +642,16 @@ ] }, "locked": { - "lastModified": 1763069267, - "narHash": "sha256-UPjIZIfh0DCVeGwjGgdRF803ELzYQr02qpWmO3wi0Ds=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "31792452cf92d204ea0df8e3fddc018235c4cf1b", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { "owner": "cachix", "repo": "git-hooks.nix", - "rev": "31792452cf92d204ea0df8e3fddc018235c4cf1b", "type": "github" } }, @@ -713,11 +712,11 @@ }, "locked": { "host": "gitlab.computer.surgery", - "lastModified": 1766355326, - "narHash": "sha256-AIfOm1ymjqkbj0DN7iKNi4Lr51AegkheIN5UOiPYpos=", + "lastModified": 1767145713, + "narHash": "sha256-rH1cjS86JYQvYvvZ3w6XLtMsCbLC7Wwcywy5pr3uMLY=", "owner": "matrix", "repo": "grapevine-fork", - "rev": "9a50c2448abba6e2b7d79c64243bb438b351616c", + "rev": "0aae932bc949d8d9c179705a015bc0ca85ac3443", "type": "gitlab" }, "original": { @@ -732,11 +731,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1766980997, - "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=", + "lastModified": 1767792169, + "narHash": "sha256-WSAu+ZxF697u/OJDdBLO+YFhtqFsPowrXXOQbjDT/uA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b", + "rev": "aea57993a89bfc2a66c0434e0f4383ebf164e2a3", "type": "github" }, "original": { @@ -1032,11 +1031,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1766815515, - "narHash": "sha256-SrO0XvjidKUf1i/VVddRRRV6R5X2KhQhs9tW32RDrJc=", - "rev": "fa6210916403c83a6662c49b3f7204e87c62340e", + "lastModified": 1767713749, + "narHash": "sha256-qkdA6fSj1av6pdI90qFxfn2WdN6vLnbUYP5y5+KjmCA=", + "rev": "1ae5610a4eb41610b08277fe0f41a4393cf2dc3f", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fa6210916403c83a6662c49b3f7204e87c62340e.tar.gz?rev=fa6210916403c83a6662c49b3f7204e87c62340e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1ae5610a4eb41610b08277fe0f41a4393cf2dc3f.tar.gz?rev=1ae5610a4eb41610b08277fe0f41a4393cf2dc3f" }, "original": { "type": "tarball", @@ -1055,11 +1054,11 @@ ] }, "locked": { - "lastModified": 1766482918, - "narHash": "sha256-0TGU/SZslVxyYLvZU7n+3gaZApbhQYAzNXYv4CbVPRU=", - "rev": "862e78b074d6d7dc9913a87bdb78070fcd0ecc34", + "lastModified": 1767364176, + "narHash": "sha256-l6YdEBYQxXjD8ujqvc0tKdwWc3K8UQOi+E4Y3DKQ318=", + "rev": "1688100bba140492658d597f6b307c327f35c780", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/862e78b074d6d7dc9913a87bdb78070fcd0ecc34.tar.gz?rev=862e78b074d6d7dc9913a87bdb78070fcd0ecc34" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/1688100bba140492658d597f6b307c327f35c780.tar.gz?rev=1688100bba140492658d597f6b307c327f35c780" }, "original": { "type": "tarball", @@ -1069,11 +1068,11 @@ "matrixSpecSrc": { "flake": false, "locked": { - "lastModified": 1766159948, - "narHash": "sha256-+EAAT/uQu761uuspCgteIdj/3cXgULcDXJSpS+XSuxw=", + "lastModified": 1767726610, + "narHash": "sha256-qdryYOtrQ7/TlA5SMHvmewIPd+wyIVatfCeqI05NbqM=", "owner": "matrix-org", "repo": "matrix-spec", - "rev": "2f6867348f0add793fabc7b4a5f548c6abd8aacc", + "rev": "70c7d59caa872dc71b54a056a80e0c1715367285", "type": "github" }, "original": { @@ -1200,11 +1199,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1766830718, - "narHash": "sha256-9OBTHJzFuuiIFSryK6Em4n8g92t1PA076QMTqsZmQIY=", + "lastModified": 1767434185, + "narHash": "sha256-S289tJM4HQQStEF9QMCtS93duiYwfecWy/zhBoEb890=", "owner": "nix-community", "repo": "nix-jetbrains-plugins", - "rev": "52b863b10d713bd3ab74c288bb6c2e54b91f735e", + "rev": "d3b3c5d901ce5980dec75f54f2ca6446f51b3451", "type": "github" }, "original": { @@ -1231,11 +1230,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1767009990, - "narHash": "sha256-Bb+nfhe3GjAv8pTrHRJTj++D/sijFbyDEHvo8odvJc4=", + "lastModified": 1767796343, + "narHash": "sha256-XYpNeZHSbOUaFRflzbXjm9az8gJwiYVExAwGTeHcvmo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2166d49cfac37b96e2ff87deda269b88715e76fd", + "rev": "4f3531b7e8db285d7d0fd154b0954eae47fde181", "type": "github" }, "original": { @@ -1247,11 +1246,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1767009990, - "narHash": "sha256-Bb+nfhe3GjAv8pTrHRJTj++D/sijFbyDEHvo8odvJc4=", + "lastModified": 1767796343, + "narHash": "sha256-XYpNeZHSbOUaFRflzbXjm9az8gJwiYVExAwGTeHcvmo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2166d49cfac37b96e2ff87deda269b88715e76fd", + "rev": "4f3531b7e8db285d7d0fd154b0954eae47fde181", "type": "github" }, "original": { @@ -1295,11 +1294,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1766687554, - "narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -1327,11 +1326,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1766840161, - "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -1343,11 +1342,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -1423,11 +1422,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { @@ -1471,11 +1470,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { @@ -1494,11 +1493,11 @@ ] }, "locked": { - "lastModified": 1765990169, - "narHash": "sha256-04ME0a3MUH/Y306dFWgOOCghzwcadTDpqJFkhLonIrw=", + "lastModified": 1767722639, + "narHash": "sha256-O0ciOrp+Hm8QUg4CuzndQfR4CCFG+SbVYUsiT/kYyAo=", "owner": "maralorn", "repo": "nix-output-monitor", - "rev": "9a32f32f807a4f7bc97d95606465243f293650fe", + "rev": "0c65fc589287bb4f795f1bb5cc9484e7e0e03549", "type": "github" }, "original": { @@ -1634,11 +1633,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1766894905, - "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", + "lastModified": 1767499857, + "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", + "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", "type": "github" }, "original": { @@ -1653,11 +1652,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1767004802, - "narHash": "sha256-Fx7JjDWBIAOwM1qyFVnAxOaJGYVOCeG5dk+nzCFXyN0=", + "lastModified": 1767295978, + "narHash": "sha256-8rKobI9uf+xH5POL2p3j+Mf0P5g032C8zAGB2BVHL4c=", "owner": "spacebarchat", "repo": "server", - "rev": "16e90d228e6186d102f13560cc3ed6985cb63db3", + "rev": "207024218fedddf0fd7d6abc858460a22178c958", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix
index 68a82ce..af72a47 100755 --- a/flake.nix +++ b/flake.nix
@@ -188,6 +188,7 @@ inherit (inputs) draupnirSrc; inherit (inputs) nixpkgs-master; inherit (inputs) nom; + inherit (inputs) nix-jetbrains-plugins; matrix-synapse-unwrapped-patched = self.packages.x86_64-linux.matrix-synapse-unwrapped-patched; draupnir = self.packages.x86_64-linux.draupnir; }; diff --git a/host/Rory-ovh/services/cgit.nix b/host/Rory-ovh/services/cgit.nix
index 854dfdf..74cea8e 100644 --- a/host/Rory-ovh/services/cgit.nix +++ b/host/Rory-ovh/services/cgit.nix
@@ -10,6 +10,7 @@ let base_cgit_config = { enable = true; nginx.virtualHost = "cgit.rory.gay"; + gitHttpBackend.checkExportOkFiles = false; #package = pkgs.cgit-pink; package = pkg; scanPath = "/data/git"; diff --git a/host/Rory-ovh/services/matrix/ooye.nix b/host/Rory-ovh/services/matrix/ooye.nix
index ff13bf8..7b85c4f 100644 --- a/host/Rory-ovh/services/matrix/ooye.nix +++ b/host/Rory-ovh/services/matrix/ooye.nix
@@ -3,6 +3,7 @@ { services.matrix-ooye = { enable = true; + debugPort = 9944; homeserver = "https://matrix.rory.gay"; homeserverName = "rory.gay"; enableSynapseIntegration = true; diff --git a/modules/base.nix b/modules/base.nix
index d2f3cc9..ae370f6 100755 --- a/modules/base.nix +++ b/modules/base.nix
@@ -114,6 +114,7 @@ environment.systemPackages = with pkgs; [ #wget + net-tools neofetch lnav pciutils