From 447f7385474d5d6b33ce8cac6ee5bcc8e7ea5df7 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 22 Dec 2023 12:58:06 +0000
Subject: [PATCH] Tweak loading order to (hopefully) fix eglot completions

Eglot capf wasn't using corfu, loading corfu after eglot seems to have
fixed this

Set mu4e to single-window mode, adjust column width to fit with a
typical vertical split pane

Remove ement binds and move mu4e to "C-c m" rather than "C-c o m"
---
 README.org | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/README.org b/README.org
index 2a0d5f3..a65274b 100644
--- a/README.org
+++ b/README.org
@@ -709,6 +709,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+BEGIN_SRC emacs-lisp
   (use-package eglot
     :ensure t
+    :demand
     :bind (("C-c c e" . eglot)
            ("C-c c C-e" . eglot-reconnect)
            ("C-c c a" . eglot-code-actions)
@@ -830,6 +831,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+begin_src emacs-lisp
   (use-package corfu
     :ensure t
+    :after (vertico orderless eglot)
     :custom
     (corfu-cycle t)
     (corfu-auto t)
@@ -874,6 +876,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 
   (use-package cape
     :ensure t
+    :after (corfu)
     :init
     (add-to-list 'completion-at-point-functions #'cape-dabbrev)
     (add-to-list 'completion-at-point-functions #'cape-file)
@@ -978,12 +981,12 @@ Set fill column to 88 and enable display in python buffers
         read-mail-command 'mu4e)
 
   (use-package mu4e
-    :bind (("C-c o m" . mu4e)
+    :bind (("C-c m" . mu4e)
            :map mu4e-view-mode-map
            ("o n" . mu4e-org-store-and-capture))
     :custom
     (mu4e-completing-read-function #'completing-read-default)
-    (mu4e-split-view 'horizontal)
+    (mu4e-split-view 'single-window)
     (mu4e-attachment-dir "~/Downloads")
     (mu4e-get-mail-command "mbsync -a")
     (mu4e-update-interval (* 5 60)) ; Every 5 minutes
@@ -1005,8 +1008,8 @@ Set fill column to 88 and enable display in python buffers
                       (:name "Last 7 days" :query "date:7d..now" :hide-unread t :key ?w)))
     (mu4e-headers-fields
      '((:human-date . 8)
-       (:from . 30)
-       (:subject . 72)
+       (:from . 24)
+       (:subject . 64)
        (:flags)))
     (mu4e-headers-visible-flags
      '(draft
@@ -1253,14 +1256,6 @@ Set fill column to 88 and enable display in python buffers
   (use-package ement
     :ensure t
     :commands ement-connect
-    :bind (("C-c m m" . ement-list-rooms)
-           ("C-c m n" . ement-notifications)
-           ("C-c m j" . ement-room-join)
-           ("C-c m l" . ement-room-leave)
-           ("C-c m v" . ement-room-view)
-           ("C-c m s" . ement-view-space)
-           ("C-c m k" . ement-kill-buffers)
-           ("C-c m c" . my/ement-connect-pantalaimon))
     :custom
     (ement-save-sessions t))
 #+end_src