From 70eee3b7b434b5321206e570b5c9513aefd31b5d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 17 Nov 2023 07:29:22 +0000
Subject: [PATCH] Add binds for ement (connect, room commands, etc...)

Move mu4e binds to make space for ement

Remove C-c C-g bind for magit to not clash with being able to cancel a
C-c command...
---
 home/emacs/init.el  | 21 +++++++++++----------
 home/emacs/init.org | 25 +++++++++++++++----------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/home/emacs/init.el b/home/emacs/init.el
index 99531cdc..95a65c8d 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -442,8 +442,7 @@
       magit-commit-diff-inhibit-same-window t)
 (use-package magit
   :ensure t
-  :bind (("C-c C-g" . magit-status)
-         ("C-c g g" . magit-status)
+  :bind (("C-c g g" . magit-status)
          ("C-c g d" . magit-dispatch)
          ("C-c g f" . magit-file-dispatch)
          ("C-c g p" . magit-pull)
@@ -603,11 +602,7 @@
 
 (use-package mu4e
   :after vertico
-  :bind (("C-c m m" . mu4e)
-         ("C-c m c" . mu4e-compose-new)
-         ("C-c m s" . mu4e-search)
-         ("C-c m b" . mu4e-search-bookmark)
-         ("C-c m j" . mu4e-search-maildir))
+  :bind (("C-c o m" . mu4e))
   :config (setq mu4e-contexts
                 (list
                  (make-mu4e-context
@@ -673,9 +668,6 @@
 
 (setq ement-save-sessions t)
 
-(use-package ement
-  :commands ement-connect)
-
 (defun my/ement-connect-pantalaimon ()
   "Connect to ement.el by calling `ement-connect' with pantalaimon service as uri-prefix"
   (interactive)
@@ -683,6 +675,15 @@
    :user-id "@tux922:tchncs.de"
    :uri-prefix "http://localhost:8008"))
 
+(use-package ement
+  :ensure t
+  :commands ement-connect
+  :bind (("C-c m m" . ement-list-rooms)
+         ("C-c m j" . ement-room-join)
+         ("C-c m l" . ement-room-leave)
+         ("C-c m v" . ement-room-view)
+         ("C-c m c" . my/ement-connect-pantalaimon)))
+
 (when (require 'emms-setup nil :noerror)
   (setq emms-player-list '(emms-player-mpv)
         emms-info-functions '(emms-info-native)
diff --git a/home/emacs/init.org b/home/emacs/init.org
index fa7e1410..c32b3b99 100644
--- a/home/emacs/init.org
+++ b/home/emacs/init.org
@@ -526,8 +526,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         magit-commit-diff-inhibit-same-window t)
   (use-package magit
     :ensure t
-    :bind (("C-c C-g" . magit-status)
-           ("C-c g g" . magit-status)
+    :bind (("C-c g g" . magit-status)
            ("C-c g d" . magit-dispatch)
            ("C-c g f" . magit-file-dispatch)
            ("C-c g p" . magit-pull)
@@ -713,11 +712,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 
   (use-package mu4e
     :after vertico
-    :bind (("C-c m m" . mu4e)
-           ("C-c m c" . mu4e-compose-new)
-           ("C-c m s" . mu4e-search)
-           ("C-c m b" . mu4e-search-bookmark)
-           ("C-c m j" . mu4e-search-maildir))
+    :bind (("C-c o m" . mu4e))
     :config (setq mu4e-contexts
                   (list
                    (make-mu4e-context
@@ -795,15 +790,25 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+begin_src emacs-lisp
   (setq ement-save-sessions t)
 
-  (use-package ement
-    :commands ement-connect)
-
   (defun my/ement-connect-pantalaimon ()
     "Connect to ement.el by calling `ement-connect' with pantalaimon service as uri-prefix"
     (interactive)
     (ement-connect
      :user-id "@tux922:tchncs.de"
      :uri-prefix "http://localhost:8008"))
+
+  (use-package ement
+    :ensure t
+    :commands ement-connect
+    :bind (("C-c m m" . ement-list-rooms)
+           ("C-c m j" . ement-room-join)
+           ("C-c m l" . ement-room-leave)
+           ("C-c m v" . ement-room-view)
+           ("C-c m c" . my/ement-connect-pantalaimon)))
+
+
+
+
 #+end_src