From e1493ae4db27d15017a2ed9684b0a4fe55e01e20 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <ssz@bitsbeats.com>
Date: Fri, 8 Jul 2022 14:17:16 +0200
Subject: [PATCH 1/2] sort ivy minibuffer bindings

---
 init.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index d37c5b9..090b5f9 100644
--- a/init.el
+++ b/init.el
@@ -87,11 +87,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))

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 2/2] 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))