mu4e: revert back bindings to SPC a M and change helm-mu bindings

Use major-mode specific key bindings for helm-mu commands.
syl20bnr · Jan 20, 2018 · 0b484bc · 0b484bc
1 parent 7487ca5
commit 0b484bc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/layers/+email/mu4e/README.org b/layers/+email/mu4e/README.org
@@ -26,6 +26,7 @@ This layer adds support for the Mu4e email client.
   - Search-based: no folders, only queries.
   - UI optimized for speed: quick keystrokes for common actions.
   - Very extendable and costumizable.
+  - Integration with Helm.
 
 * Install
 In order to use this layer you must install mu and mu4e separately. Typically
@@ -54,9 +55,11 @@ existing =dotspacemacs-configuration-layers= list in this file.
 * Commands
 ** Global bindings
 
-| Keybinding | Command    |
-|------------+------------|
-| ~SPC a M~  | Start mu4e |
+| Keybinding             | Command                         |
+|------------------------+---------------------------------|
+| ~SPC a M~              | Start mu4e                      |
+| ~SPC m S~ or ~SPC m /~ | Search emails (requires helm)   |
+| ~SPC m C~              | Search contacts (requires helm) |
 
 ** Headers mode
 

diff --git a/layers/+email/mu4e/packages.el b/layers/+email/mu4e/packages.el
@@ -14,7 +14,7 @@
         (mu4e :location site)
         mu4e-alert
         mu4e-maildirs-extension
-        helm-mu
+        (helm-mu :requires helm)
         org
         persp-mode
         ))
@@ -41,7 +41,7 @@
     :commands (mu4e mu4e-compose-new)
     :init
     (progn
-      (spacemacs/set-leader-keys "a m m" 'mu4e)
+      (spacemacs/set-leader-keys "a M" 'mu4e)
       (global-set-key (kbd "C-x m") 'mu4e-compose-new))
     :config
     (progn
@@ -93,14 +93,16 @@
               (mu4e-alert-enable-mode-line-display)))))
 
 (defun mu4e/init-helm-mu ()
-  (spacemacs/set-leader-keys
-    "a m s" 'helm-mu
-    "a m c" 'helm-mu-contacts))
-
-(defun mu4e/post-init-helm ()
-  (require 'helm-config)
-  (autoload 'helm-mu "helm-mu" "" t)
-  (autoload 'helm-mu-contacts "helm-mu" "" t))
+  (use-package helm-mu
+    :defer t
+    :init (dolist (m '(mu4e-main-mode-hook
+                       mu4e-headers-mode-hook
+                       mu4e-view-mode-hook
+                       mu4e-compose-mode-hook))
+            (spacemacs/set-leader-keys-for-major-mode m
+              "S" 'helm-mu
+              "/" 'helm-mu
+              "C" 'helm-mu-contacts))))
 
 (defun mu4e/init-mu4e-maildirs-extension ()
   (use-package mu4e-maildirs-extension