diff options
| -rw-r--r-- | .emacs.d/custom.el | 2 | ||||
| -rw-r--r-- | .emacs.d/init.org | 50 |
2 files changed, 25 insertions, 27 deletions
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 8f81948..c339f2b 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -15,7 +15,7 @@ '(markdown-command "/usr/bin/markdown-calibre") '(package-selected-packages (quote - (highlight-numbers langtool clang-format+ keycast gif-screencast py-autopep8 elpy inf-ruby move-text git-timemachine debbugs async-await request emojify auctex diminish bats-mode bool-flip salt-mode flycheck-rust rust-playground rust-mode vue-mode coffee-mode json-reformat erc-hl-nicks emoji-cheat-sheet-plus helm-circe htmlize cmake-mode websocket markdown-mode go-mode magit evil-leader evil helm projectile org-eldoc evil-commentary yasnippet yaml-mode which-key web-mode wc-mode use-package terraform-mode smart-tabs-mode slim-mode scss-mode rainbow-delimiters php-mode org-evil olivetti mu4e-alert mmm-jinja2 markdown-preview-mode helm-projectile helm-ag go-eldoc go-add-tags flycheck evil-surround evil-org evil-numbers evil-mu4e evil-magit evil-args dockerfile-mode disable-mouse default-text-scale crux cmake-font-lock ag)))) + (evil-collection highlight-numbers langtool clang-format+ keycast gif-screencast py-autopep8 elpy inf-ruby move-text git-timemachine debbugs async-await request emojify auctex diminish bats-mode bool-flip salt-mode flycheck-rust rust-playground rust-mode vue-mode coffee-mode json-reformat erc-hl-nicks emoji-cheat-sheet-plus helm-circe htmlize cmake-mode websocket markdown-mode go-mode magit evil-leader evil helm projectile org-eldoc evil-commentary yasnippet yaml-mode which-key web-mode wc-mode use-package terraform-mode smart-tabs-mode slim-mode scss-mode rainbow-delimiters php-mode org-evil olivetti mu4e-alert mmm-jinja2 markdown-preview-mode helm-projectile helm-ag go-eldoc go-add-tags flycheck evil-surround evil-org evil-numbers evil-magit evil-args dockerfile-mode disable-mouse default-text-scale crux cmake-font-lock ag)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 25175ed..1103ea9 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -1035,6 +1035,11 @@ Now make sure that Evil is installed, and call the relevant configuration functi #+BEGIN_SRC elisp (use-package evil :ensure t + :init + (progn + ;; Needed by evil-collection + (setq evil-want-integration nil + evil-want-keybinding nil)) :config (add-hook 'evil-mode-hook 'mssola-evil) (evil-mode 1) @@ -1504,35 +1509,28 @@ Adding hooks for composing and viewing messages. I want desktop notifications when receiving email. #+BEGIN_SRC elisp - (use-package mu4e-alert - :ensure t - :config +(use-package mu4e-alert + :ensure t + :config - ; Notify me for unread emails from my inbox. - (mu4e-alert-set-default-style 'libnotify) - (add-hook 'after-init-hook #'mu4e-alert-enable-notifications) - (add-hook 'after-init-hook #'mu4e-alert-enable-mode-line-display) - (setq mu4e-alert-interesting-mail-query - (concat - "(maildir:/gmail/inbox OR maildir:/susecom/inbox OR maildir:/susede/inbox OR maildir:/ajuntament/inbox) " - "AND flag:unread AND NOT flag:trashed")) - (setq mu4e-alert-email-notification-types '(count))) - - ; Evil mode in mu4e - (with-eval-after-load 'evil - (use-package evil-mu4e - :ensure t - :config + ; Notify me for unread emails from my inbox. + (mu4e-alert-set-default-style 'libnotify) + (add-hook 'after-init-hook #'mu4e-alert-enable-notifications) + (add-hook 'after-init-hook #'mu4e-alert-enable-mode-line-display) + (setq mu4e-alert-interesting-mail-query + (concat + "(maildir:/gmail/inbox OR maildir:/susecom/inbox OR maildir:/susede/inbox OR maildir:/ajuntament/inbox) " + "AND flag:unread AND NOT flag:trashed")) + (setq mu4e-alert-email-notification-types '(count))) - ; Idea taken from evil-mu4e.el - (defvar mssola-evil-mu4e-mode-map-bindings - `((,evil-mu4e-state mu4e-headers-mode-map "\C-u" evil-scroll-up) - (,evil-mu4e-state mu4e-main-mode-map "\C-u" evil-scroll-up) - (,evil-mu4e-state mu4e-view-mode-map "h" evil-backward-char))) + ; Evil mode in mu4e +(with-eval-after-load 'evil + (use-package evil-collection + :ensure t + :after evil + :config - (dolist (binding mssola-evil-mu4e-mode-map-bindings) - (evil-define-key - (nth 0 binding) (nth 1 binding) (nth 2 binding) (nth 3 binding))))) + (evil-collection-init 'mu4e))) #+END_SRC And finally define a proper shortcut. |