From 730195c67cf76ed24093078ce03b270c8b72dd0a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 9 May 2024 10:54:00 +0200
Subject: [PATCH] move bridge overlay to overlays

---
 modules/discord-matrix-bridge.nix             | 22 -------
 modules/toolchains.nix                        | 57 -------------------
 overlays/default.nix                          |  1 +
 overlays/matrix-appservice-discord.nix        | 20 +++++++
 .../patches/bridge_perms.patch                |  0
 5 files changed, 21 insertions(+), 79 deletions(-)
 delete mode 100644 modules/toolchains.nix
 create mode 100644 overlays/matrix-appservice-discord.nix
 rename modules/patch_bridge_perms.patch => overlays/patches/bridge_perms.patch (100%)

diff --git a/modules/discord-matrix-bridge.nix b/modules/discord-matrix-bridge.nix
index d98d462..219b1bd 100644
--- a/modules/discord-matrix-bridge.nix
+++ b/modules/discord-matrix-bridge.nix
@@ -8,28 +8,6 @@ let
   bridge_port = 9005; # netstat -nlp | grep 9005
 in
 {
-  nixpkgs.overlays = [
-    (final: prev: {
-      matrix-appservice-discord = prev.matrix-appservice-discord.overrideAttrs (old: {
-        src = pkgs.fetchFromGitHub {
-          owner = "t2bot";
-          repo = "matrix-appservice-discord";
-          rev = "8361ca6121bf1f0902154baa538cb6d5766e477f";
-          hash = "sha256-oXon6pFJgqQ1uBLtsSVNH7XSOpxxJYqpW2n9cFrs3sU=";
-        };
-        patches =
-          (
-            let
-              oldPatches = old.patches or [ ];
-            in
-            if oldPatches == null then [ ] else oldPatches
-          )
-          ++ [ ./patch_bridge_perms.patch ];
-        doCheck = false;
-      });
-    })
-  ];
-
   age.secrets.matrix_discord_bridge_token.file = ../secrets/matrix_discord_bridge_token.age;
 
   services.matrix-synapse-next.settings.app_service_config_files = [
diff --git a/modules/toolchains.nix b/modules/toolchains.nix
deleted file mode 100644
index 8a731f0..0000000
--- a/modules/toolchains.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ config, pkgs, ... }:
-let
-  git_user = "Grimmauld";
-in
-{
-  environment.systemPackages = with pkgs; [
-    (writeShellScriptBin "silent-add" "git add --intent-to-add $@ ; git update-index --assume-unchanged $@")
-    (writeShellScriptBin "systemd-owner" "systemctl show -pUser,UID $@")
-    (writeShellScriptBin "nix-referrers" "nix-store --query --referrers $@")
-    mkpasswd
-    node2nix
-  ];
-
-  programs.git = {
-    enable = true;
-    lfs.enable = true;
-    config = {
-      init.defaultBranch = "main";
-      credential.username = git_user;
-      core.editor = "${pkgs.neovim}/bin/nvim";
-      user.name = git_user;
-      user.email = "${git_user}@grimmauld.de";
-    };
-  };
-
-  programs.tmux = {
-    enable = true;
-    historyLimit = 42000;
-    #keyMode = "vi";
-  };
-
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    defaultEditor = true;
-    configure = {
-      customRC = ''
-        set number
-        set hidden
-        set nocompatible
-      '';
-      packages.myVimPackage = with pkgs.vimPlugins; {
-        # loaded on launch
-        start = [
-          vim-nix
-          vim-scala
-          fugitive
-          autoclose-nvim
-        ];
-        # manually loadable by calling `:packadd $plugin-name`
-        opt = [ ];
-      };
-    };
-  };
-
-  programs.xonsh.enable = true;
-}
diff --git a/overlays/default.nix b/overlays/default.nix
index e4f1b4d..7a1b523 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -17,6 +17,7 @@
         )
       )
       [
+        ./matrix-appservice-discord.nix
         ./deskwhich.nix
         ./mcontrolcenter.nix
         ./the-powder-toy.nix
diff --git a/overlays/matrix-appservice-discord.nix b/overlays/matrix-appservice-discord.nix
new file mode 100644
index 0000000..57d59f8
--- /dev/null
+++ b/overlays/matrix-appservice-discord.nix
@@ -0,0 +1,20 @@
+{ final, prev, ... }:
+{
+  matrix-appservice-discord = prev.matrix-appservice-discord.overrideAttrs (old: {
+        src = prev.fetchFromGitHub {
+          owner = "t2bot";
+          repo = "matrix-appservice-discord";
+          rev = "8361ca6121bf1f0902154baa538cb6d5766e477f";
+          hash = "sha256-oXon6pFJgqQ1uBLtsSVNH7XSOpxxJYqpW2n9cFrs3sU=";
+        };
+        patches =
+          (
+            let
+              oldPatches = old.patches or [ ];
+            in
+            if oldPatches == null then [ ] else oldPatches
+          )
+          ++ [ ./patches/bridge_perms.patch ];
+        doCheck = false;
+      });
+}
diff --git a/modules/patch_bridge_perms.patch b/overlays/patches/bridge_perms.patch
similarity index 100%
rename from modules/patch_bridge_perms.patch
rename to overlays/patches/bridge_perms.patch