From 78f3761754a79551493f84c7185cc52ba9bab1e7 Mon Sep 17 00:00:00 2001 From: coolneng Date: Fri, 28 Feb 2025 06:08:24 +0100 Subject: [PATCH] Remove broken Matrix bridges module --- flake.lock | 227 +------------------------------------- flake.nix | 2 - modules/communication.nix | 46 -------- scripts/motd.sh | 4 - 4 files changed, 1 insertion(+), 278 deletions(-) diff --git a/flake.lock b/flake.lock index 4387288..ba90f06 100644 --- a/flake.lock +++ b/flake.lock @@ -23,39 +23,6 @@ "type": "github" } }, - "crane": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "rust-overlay": [ - "lanzaboote", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1681177078, - "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -94,22 +61,6 @@ } }, "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": 1641205782, @@ -125,67 +76,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -207,37 +97,10 @@ "type": "github" } }, - "lanzaboote": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1682802423, - "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "64b903ca87d18cef2752c19c098af275c6e51d63", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.3.0", - "repo": "lanzaboote", - "type": "github" - } - }, "nix-matrix-appservices": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixlib": "nixlib", "nixpkgs": [ "nixpkgs" @@ -303,22 +166,6 @@ "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1729880355, @@ -334,72 +181,15 @@ "type": "indirect" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1681413034, - "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", - "lanzaboote": "lanzaboote", "nix-matrix-appservices": "nix-matrix-appservices", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -414,21 +204,6 @@ "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", diff --git a/flake.nix b/flake.nix index 71f3356..58a9e3e 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,6 @@ nixpkgs-unstable, agenix, nixos-hardware, - nix-matrix-appservices, ... }@inputs: let @@ -41,7 +40,6 @@ modules = [ (import ./configuration.nix) agenix.nixosModules.age - nix-matrix-appservices.nixosModule nixos-hardware.nixosModules.aoostar-r1-n100 ]; specialArgs = { diff --git a/modules/communication.nix b/modules/communication.nix index b31852a..ea76c90 100644 --- a/modules/communication.nix +++ b/modules/communication.nix @@ -34,11 +34,6 @@ in # HACK Inherit postgres connection string for the rest of the DBs app_service_api = { inherit database; - config_files = [ - "/var/lib/matrix-as-facebook/facebook-registration.yaml" - "/var/lib/matrix-as-signal/signal-registration.yaml" - "/var/lib/matrix-as-telegram/telegram-registration.yaml" - ]; }; media_api = { inherit database; @@ -79,47 +74,6 @@ in /var/lib/matrix-as-telegram ]; - # Matrix bridges - services.matrix-appservices = { - homeserver = "dendrite"; - homeserverDomain = "coolneng.duckdns.org"; - homeserverURL = "https://matrix.coolneng.duckdns.org"; - services = { - telegram = { - port = 8118; - format = "mautrix-python"; - package = mautrix-telegram; - serviceConfig.EnvironmentFile = config.age.secrets.telegram.path; - settings = { - appservice.database = "$DB_STRING"; - homeserver.software = "standard"; - telegram = { - api_id = "$API_ID"; - api_hash = "$API_HASH"; - }; - bridge = { - permissions."@coolneng:coolneng.duckdns.org" = "admin"; - backfill.normal_groups = true; - }; - }; - }; - facebook = { - port = 8228; - format = "mautrix-python"; - package = mautrix-meta; - serviceConfig.EnvironmentFile = config.age.secrets.facebook.path; - settings = { - appservice.database = "$DB_STRING"; - homeserver.software = "standard"; - bridge.permissions."@coolneng:coolneng.duckdns.org" = "admin"; - }; - }; - }; - }; - - # Enable voice messages for facebook - systemd.services.matrix-as-facebook.path = [ ffmpeg ]; - # MQTT configuration services.mosquitto = { enable = true; diff --git a/scripts/motd.sh b/scripts/motd.sh index 22e7311..97b6052 100755 --- a/scripts/motd.sh +++ b/scripts/motd.sh @@ -26,10 +26,6 @@ services=( "phpfpm-wallabag.service" "gitea.service" "dendrite.service" - "matrix-as-telegram.service" - "matrix-as-facebook.service" - "matrix-as-signal.service" - "signald.service" "nginx.service" "dnsmasq.service" "podman-openbooks.service"