From cb4d0180e3d4898d63b99b085ad5fa8766be02b2 Mon Sep 17 00:00:00 2001
From: Grégoire Duchêne <gduchene@awhk.org>
Date: Mon, 17 May 2021 15:46:59 +0100
Subject: emacs: Configure Evil with use-package

Also, use evil-collection instead of evil-magit as the latter has been
incorporated into the former.
---
 emacs/init.el | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'emacs/init.el')

diff --git a/emacs/init.el b/emacs/init.el
index 3e11880..32d1b55 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -37,7 +37,6 @@
 (column-number-mode 1)
 (display-time-mode 1)
 (electric-indent-mode -1)
-(evil-mode 1)
 (global-auto-revert-mode 1)
 (menu-bar-mode -1)
 (show-paren-mode 1)
@@ -78,7 +77,15 @@
   (exec-path-from-shell-initialize)
   :ensure t)
 
-(use-package evil-magit :ensure t)
+(use-package evil
+  :init (setq evil-want-keybinding nil)
+  :config (evil-mode)
+  :ensure t)
+
+(use-package evil-collection
+  :config (evil-collection-init 'magit)
+  :after evil
+  :ensure t)
 
 (use-package go-mode
   :init
@@ -123,7 +130,6 @@
 
 (use-package magit
   :init (setq git-commit-summary-max-length 50)
-  :config (require 'evil-magit)
   :bind (("C-c k" . magit-status))
   :ensure t)
 
-- 
cgit v1.2.3-70-g09d2