From 83d796221245713369670e9132cdc7140d62a377 Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Thu, 16 May 2024 18:17:26 -0600
Subject: [PATCH] flake.lock: update nixpkgs and use mautrix-signal2

Signed-off-by: Sumner Evans <me@sumnerevans.com>
---
 flake.lock                                       | 12 ++++++------
 nixos/hosts/matrix/default.nix                   |  2 +-
 nixos/modules/services/matrix/mautrix-signal.nix |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 79e5e20..d6fd5e1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,11 +51,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714522709,
-        "narHash": "sha256-oUXZsdZ7YoXXSUuiMa3/oNwryjCmeE7N8fNYOa5YPj0=",
+        "lastModified": 1715787935,
+        "narHash": "sha256-pAnGGrugMsrX9stncOhVXxpRwMHx2RuwPYJcZOx6RsM=",
         "owner": "ColoradoSchoolOfMines",
         "repo": "mineshspc.com",
-        "rev": "a153c7d6ac88240e00e152c3d47db91a84356a74",
+        "rev": "70ead8be5edd6cd9da2d594cf62e8f37622c661f",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714906307,
-        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
+        "lastModified": 1715787315,
+        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
+        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
         "type": "github"
       },
       "original": {
diff --git a/nixos/hosts/matrix/default.nix b/nixos/hosts/matrix/default.nix
index 3230d64..e3b5d55 100644
--- a/nixos/hosts/matrix/default.nix
+++ b/nixos/hosts/matrix/default.nix
@@ -149,7 +149,7 @@
   } // (import ../../../secrets/matrix/appservices/mautrix-discord.nix);
 
   # Signal <-> Matrix Bridge
-  services.mautrix-signal = {
+  services.mautrix-signal2 = {
     enable = true;
     homeserver = "https://matrix.nevarro.space";
     secretYAML = "/run/keys/appservice_login_shared_secret_yaml";
diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix
index abb95af..3c88d99 100644
--- a/nixos/modules/services/matrix/mautrix-signal.nix
+++ b/nixos/modules/services/matrix/mautrix-signal.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 with lib;
 let
-  cfg = config.services.mautrix-signal;
+  cfg = config.services.mautrix-signal2;
 
   mautrixSignalAppserviceConfig = {
     id = "signal";
@@ -107,7 +107,7 @@ let
     yamlFormat.generate "mautrix-signal-config.yaml" mautrixSignalConfig;
 in {
   options = {
-    services.mautrix-signal = {
+    services.mautrix-signal2 = {
       enable = mkEnableOption "mautrix-signal, a Signal <-> Matrix bridge.";
       useLocalSynapse = mkOption {
         type = types.bool;