cleanup evil setup

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))