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
+(use-package evil-collection :ensure t
-             :ensure t
+  :after evil
-             :config
+  :config
-             (evil-collection-init))
+  (evil-collection-init)
-(use-package evil-surround
+  :custom
-  :ensure t
+  (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))
@@ -87,11 +91,11 @@
   (setq ivy-re-builders-alist
 	'((swiper . ivy--regex-plus)
 	  (t      . ivy--regex-plus)))
+  (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL"))
   (define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line)
   (define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line)
-  (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL"))
-  (define-key ivy-minibuffer-map (kbd "C-S-h") help-map)
   (define-key ivy-minibuffer-map (kbd "C-l") 'ivy-alt-done)
+  (define-key ivy-minibuffer-map (kbd "C-S-h") help-map)
   (define-key ivy-minibuffer-map (kbd "<escape>") 'minibuffer-keyboard-quit))
 (use-package ivy-xref :ensure t
   :init (setq xref-show-xrefs-function #'ivy-xref-show-xrefs))