From c44f638208888e791ec2a59c1560369fecf07e02 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Sun, 27 Jun 2021 08:17:17 +0300
Subject: [PATCH] update nheko

---
 flake.lock                          | 28 ++++++++++++++++++++++------
 flake.nix                           |  7 ++++++-
 profiles/applications/emacs/init.el |  2 --
 profiles/overlay.nix                | 12 ++++++------
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3c1cc1d..995ac50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -318,6 +318,22 @@
         "type": "github"
       }
     },
+    "mtxclient": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1624110239,
+        "narHash": "sha256-JlTGwFZKQ0sJpOPtMPKY9wm11yDrdyNw9OKr7E4yBOQ=",
+        "owner": "nheko-reborn",
+        "repo": "mtxclient",
+        "rev": "acfff15ca153723e41cf7ef06ff82b1c24c933ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nheko-reborn",
+        "repo": "mtxclient",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -342,16 +358,15 @@
     "nheko": {
       "flake": false,
       "locked": {
-        "lastModified": 1624023535,
-        "narHash": "sha256-m1gt1pUX1VnZIJzGGde52ZbKn4o44p2RM3f6sUtJcM4=",
-        "owner": "balsoft",
+        "lastModified": 1624613955,
+        "narHash": "sha256-/k/081pI0S8YHxbct1yhNqJQW4EKfu9/KsjLZ2CoQDU=",
+        "owner": "nheko-reborn",
         "repo": "nheko",
-        "rev": "9f798e76ede3672d91276b1be7dd20de5459c9df",
+        "rev": "36f0e044398535143f24bbf2850df9e5b2947770",
         "type": "github"
       },
       "original": {
-        "owner": "balsoft",
-        "ref": "allow-edits-of-pending-messages",
+        "owner": "nheko-reborn",
         "repo": "nheko",
         "type": "github"
       }
@@ -606,6 +621,7 @@
         "impermanence": "impermanence",
         "lambda-launcher": "lambda-launcher",
         "materia-theme": "materia-theme",
+        "mtxclient": "mtxclient",
         "nheko": "nheko",
         "nix": "nix",
         "nix-direnv": "nix-direnv",
diff --git a/flake.nix b/flake.nix
index 1ee50e8..9aac225 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,12 @@
     nix-direnv = { url = "github:nix-community/nix-direnv"; };
 
     nheko = {
-      url = "github:balsoft/nheko/allow-edits-of-pending-messages";
+      url = "github:nheko-reborn/nheko";
+      flake = false;
+    };
+
+    mtxclient ={
+      url = "github:nheko-reborn/mtxclient";
       flake = false;
     };
   };
diff --git a/profiles/applications/emacs/init.el b/profiles/applications/emacs/init.el
index c7261cd..218399e 100755
--- a/profiles/applications/emacs/init.el
+++ b/profiles/applications/emacs/init.el
@@ -222,8 +222,6 @@ nothing happens."
         (add-hook 'after-save-hook 'compile-on-save-start nil t))
       (kill-local-variable 'after-save-hook)))
 
-
-
 (require 'base16-theme)
 
 (defvar base16-generated-colors
diff --git a/profiles/overlay.nix b/profiles/overlay.nix
index 162fcbb..423c87a 100644
--- a/profiles/overlay.nix
+++ b/profiles/overlay.nix
@@ -107,13 +107,13 @@ in {
 
       nix-direnv = inputs.nix-direnv.defaultPackage.${system};
 
-      nheko = super.nheko.overrideAttrs (oa: {
-        src = inputs.nheko;
-        patches = [(self.fetchpatch {
-          url = "https://nheko.im/nheko-reborn/nheko/-/commit/78fb89355f189e4fb57e8d0ca0089e09547fea50.patch";
-          sha256 = "0lqjzv5k9cxi7sfrhj0a75vyzx1m5bzvmbvn4ckr098zilr914bb";
-        })] ++ oa.patches or [];
+      mtxclient = super.mtxclient.overrideAttrs (_: {
+        src = inputs.mtxclient;
       });
+
+      nheko = (super.nheko.overrideAttrs (oa: {
+        src = inputs.nheko;
+      })).override { mtxclient = self.mtxclient; };
     })
   ];
   nixpkgs.config = {