Remove matterbridge code

2 files changed, 12 insertions, 36 deletions

diff --git a/secrets/secret-envrc.sh b/secrets/secret-envrc.sh
index b0288e9..dae40fb 100644
--- a/secrets/secret-envrc.sh
+++ b/secrets/secret-envrc.sh
diff --git a/vps-configuration.env.nix b/vps-configuration.env.nix
index bf5aee2..0fbc928 100644
--- a/vps-configuration.env.nix
+++ b/vps-configuration.env.nix
@@ -29,14 +29,11 @@ let
     prosodyMUCTLD = "$PROSODY_MUC_TLD";
     prosodyPort = "$PROSODY_PORT";
     prosodyHTTPPort = "$PROSODY_HTTP_PORT";
-    matterbridgeWhatsappNumber = "$MATTERBRIDGE_WHATSAPP_NUMBER";
-    matterbridgeBotJID = "$MATTERBRIDGE_BOT_JID";
-    matterbridgeBotPassword = "$MATTERBRIDGE_BOT_PASSWORD";
-    matterbridgeBotNick = "$MATTERBRIDGE_BOT_NICK";
-    matterbridgeMUCServer = "$MATTERBRIDGE_MUC_SERVER";
-    matterbridgeXMPPServer = "$MATTERBRIDGE_XMPP_SERVER";
-    matterbridgeXMPPChannel = "$MATTERBRIDGE_XMPP_CHANNEL";
   };
+  pkgsUnstable = import (pkgs.fetchzip {
+    url = "https://github.com/NixOS/nixpkgs/archive/40ae9e79dda88912d37d83a7a07bb5d863425c2a.zip";
+      sha256 = "0basm2rib6kyxkf21r9hfp1zrbh8lf12anvsc8yq6jj045k3zp80";
+  }) { };
   staticSiteFromRepo = repoName:
     pkgs.stdenv.mkDerivation {
       name = repoName;
@@ -50,6 +47,14 @@ let
       '';
     };
 in {
+  nixpkgs = {
+    overlays = [
+      (self: super: {
+        matterbridge = pkgsUnstable.matterbridge;
+      })
+    ];
+  };
+
   imports = [ ./hardware-configuration.nix ];
 
   boot.loader.grub = {
@@ -239,35 +244,6 @@ in {
       };
     };
 
-    matterbridge = {
-      enable = false;
-      configFile = ''
-        [whatsapp.mywhatsapp]
-        Number="${envsubstConfiguration.matterbridgeWhatsappNumber}"
-        RemoteNickFormat="[{PROTOCOL}] @<{NICK}>:"
-
-        [xmpp.myxmpp]
-        Server="${envsubstConfiguration.matterbridgeXMPPServer}"
-        Jid="${envsubstConfiguration.matterbridgeBotJID}"
-        Password="${envsubstConfiguration.matterbridgeBotPassword}"
-        Muc="${envsubstConfiguration.matterbridgeMUCServer}"
-        Nick="${envsubstConfiguration.matterbridgeBotNick}"
-        RemoteNickFormat="[{PROTOCOL}] <{NICK}>"
-
-        [[gateway]]
-        name="gateway1"
-        enable=true
-
-        [[gateway.inout]]
-        account="whatsapp.mywhatsapp"
-        channel="dunno"
-
-        [[gateway.inout]]
-        account="xmpp.myxmpp"
-        channel="${envsubstConfiguration.matterbridgeXMPPChannel}"
-      '';
-    };
-
     lighttpd = {
       enable = true;
       port = pkgs.lib.toInt envsubstConfiguration.gitPort;