From 4a4d5a148db26601dcd1c9b54a8cf8779e03fc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sun, 1 Nov 2020 09:44:50 +0100
Subject: [PATCH] chore: move matterbridge to configs

---
 configs/matterbridge.nix       | 53 ++++++++++++++++++++++++++++++++++
 lib/matterbridge.nix           | 41 --------------------------
 systems/toum/configuration.nix | 17 +----------
 3 files changed, 54 insertions(+), 57 deletions(-)
 create mode 100644 configs/matterbridge.nix
 delete mode 100644 lib/matterbridge.nix

diff --git a/configs/matterbridge.nix b/configs/matterbridge.nix
new file mode 100644
index 0000000..bda4162
--- /dev/null
+++ b/configs/matterbridge.nix
@@ -0,0 +1,53 @@
+{ pkgs, lib, ... }:
+let
+  bridgeBotToken = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+  config = {
+    general = {
+      RemoteNickFormat = "[{NOPINGNICK}] ";
+      Charset = "utf-8";
+    };
+    telegram.kmein.Token = bridgeBotToken;
+    irc.freenode = {
+      Server = "irc.freenode.net:6667";
+      Nick = "tg_bridge";
+    };
+    gateway = [
+      {
+        name = "krebs-bridge";
+        enable = true;
+        inout = [
+          {
+            account = "irc.freenode";
+            channel = "#krebs";
+          }
+          {
+            account = "telegram.kmein";
+            channel = "-330372458";
+          }
+        ];
+      }
+      {
+        name = "myengadin-bridge";
+        enable = true;
+        inout = [
+          {
+            account = "irc.freenode";
+            channel = "##myengadin";
+          }
+          {
+            account = "telegram.kmein";
+            channel = "-425759153";
+          }
+        ];
+      }
+    ];
+  };
+in
+{
+  nixpkgs.overlays = [ (import <niveum/overlays/toml.nix>) ];
+
+  services.matterbridge = {
+    enable = true;
+    configPath = toString (pkgs.writeTOML config);
+  };
+}
diff --git a/lib/matterbridge.nix b/lib/matterbridge.nix
deleted file mode 100644
index 90e1309..0000000
--- a/lib/matterbridge.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ token }: {
-  general = {
-    RemoteNickFormat = "[{NOPINGNICK}] ";
-    Charset = "utf-8";
-  };
-  telegram.kmein.Token = token;
-  irc.freenode = {
-    Server = "irc.freenode.net:6667";
-    Nick = "tg_bridge";
-  };
-  gateway = [
-    {
-      name = "krebs-bridge";
-      enable = true;
-      inout = [
-        {
-          account = "irc.freenode";
-          channel = "#krebs";
-        }
-        {
-          account = "telegram.kmein";
-          channel = "-330372458";
-        }
-      ];
-    }
-    {
-      name = "myengadin-bridge";
-      enable = true;
-      inout = [
-        {
-          account = "irc.freenode";
-          channel = "##myengadin";
-        }
-        {
-          account = "telegram.kmein";
-          channel = "-425759153";
-        }
-      ];
-    }
-  ];
-}
diff --git a/systems/toum/configuration.nix b/systems/toum/configuration.nix
index f751e2f..9b15245 100644
--- a/systems/toum/configuration.nix
+++ b/systems/toum/configuration.nix
@@ -15,27 +15,12 @@ in {
     <niveum/configs/tmux.nix>
     <niveum/configs/version.nix>
     <niveum/configs/traadfri.nix>
+    <niveum/configs/matterbridge.nix>
     <niveum/modules/retiolum.nix>
     <niveum/modules/telegram-bot.nix>
     {
       services.rss-bridge.enable = true;
     }
-    {
-      nixpkgs = {
-        overlays = [ (import <niveum/overlays/toml.nix>) ];
-        config.packageOverrides = pkgs: {
-          writeDash = pkgs.writers.writeDash;
-          writeDashBin = pkgs.writers.writeDashBin;
-        };
-      };
-
-      services.matterbridge = {
-        enable = true;
-        configPath = toString (pkgs.writeTOML (import <niveum/lib/matterbridge.nix> {
-          token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
-        }));
-      };
-    }
     {
       services.weechat.enable = true;
       users.extraUsers.weechat = {