From 040457e2414c9037439615cd6cb0a06068f690b8 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 11 Feb 2021 03:40:14 +0000
Subject: [PATCH] mx-puppet-discord now functions.

So hacky. How awful.
---
 config/hosts/beltane/services/matrix.nix | 25 ++++++++++++++++++++++++
 pkgs/default.nix                         |  5 ++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/config/hosts/beltane/services/matrix.nix b/config/hosts/beltane/services/matrix.nix
index ec64fdfc..65e89279 100644
--- a/config/hosts/beltane/services/matrix.nix
+++ b/config/hosts/beltane/services/matrix.nix
@@ -2,12 +2,17 @@
 
 let secrets = (import ../secrets.nix);
 in {
+  environment.systemPackages = [
+    pkgs.arc.pkgs.mx-puppet-discord
+  ];
+
   services.matrix-synapse = {
     enable = true;
     registration_shared_secret = secrets.matrix.secret;
     server_name = "kittywit.ch";
     app_service_config_files = [
       "/var/lib/matrix-synapse/telegram-registration.yaml"
+      "/var/lib/matrix-synapse/discord-registration.yaml"
     ];
     listeners = [{
       port = 8008;
@@ -46,4 +51,24 @@ in {
     };
     environmentFile = "/etc/secrets/mautrix-telegram.env";
   };
+  systemd.services.mx-puppet-discord = {
+    serviceConfig = {
+      Type = "simple";
+      Restart = "always";
+      ExecStart = "${pkgs.arc.pkgs.mx-puppet-discord}/bin/mx-puppet-discord -c /var/lib/mx-puppet-discord/config.yaml -f /var/lib/mx-puppet-discord/discord-registration.yaml";
+      WorkingDirectory = "/var/lib/mx-puppet-discord";
+      DynamicUser = true;
+      StateDirectory = "mx-puppet-discord";
+      UMask = 0027;
+      PrivateTmp = true;
+      ProtectSystem = "strict";
+      ProtectHome = true;
+      ProtectKernelTunables = true;
+      ProtectKernelModules = true;
+      ProtectControlGroups = true;
+    };
+    requisite = [ "matrix-synapse.service" ];
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network.target" ];
+  };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index aa6e1df5..d6f4e8d1 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -11,11 +11,10 @@ let
       inherit (pkgs) dino;
     };
 
-    matrix-appservice-irc = callPackage "${sources.arc-nixexprs}/pkgs/public/matrix" {};
-    mx-puppet-discord = callPackage "${sources.arc-nixexprs}/pkgs/public/mx-puppet-discord" {};
-
     discord = pkgs.discord.override { nss = pkgs.nss_latest; };
 
+    arc = import sources.arc-nixexprs { inherit pkgs; };
+
     linuxPackagesFor = kernel:
       (pkgs.linuxPackagesFor kernel).extend (_: ksuper: {
         vendor-reset =