From 4bcc4d212ab1cbed6d773b68d3fcc9568a35cb6f Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <ssz@bitsbeats.com>
Date: Fri, 8 Jul 2022 14:17:37 +0200
Subject: [PATCH] cleanup evil setup

---
 init.el | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/init.el b/init.el
index 090b5f9..7438d9f 100644
--- a/init.el
+++ b/init.el
@@ -57,19 +57,23 @@
                     :width 'normal)
 
 ;; evil config
-(setq evil-want-keybinding nil)
 (use-package evil :ensure t
+  :init
+  (setq evil-want-integration t)
+  (setq evil-want-keybinding nil)
   :config
   (evil-mode 1)
   (global-undo-tree-mode)
   (evil-set-undo-system 'undo-tree)
   (global-display-line-numbers-mode))
-(use-package evil-collection
-             :ensure t
-             :config
-             (evil-collection-init))
-(use-package evil-surround
-  :ensure t
+(use-package evil-collection :ensure t
+  :after evil
+  :config
+  (evil-collection-init)
+  :custom
+  (evil-collection-setup-minibuffer t))
+(use-package evil-surround :ensure t
+  :after evil
   :config
   (global-evil-surround-mode 1)
   (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region))