From 0097d1f3e22565ffb6db689c06ee2f9610cd45d0 Mon Sep 17 00:00:00 2001
From: Guangxiong Lin <hi@gxlin.org>
Date: Sat, 12 Mar 2022 23:11:30 +0800
Subject: Refactor evil config (emacs)

---
 .emacs.d/lisp/init-evil.el | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

(limited to '.emacs.d/lisp/init-evil.el')

diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index a3f5cc4..d950f73 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -1,14 +1,12 @@
-(use-package evil
-  :ensure t
-  :hook ((evil-org-mode . (lambda () (setq evil-want-C-i-jump nil)))
-	 (after-init . (lambda () (evil-mode 1))))
-  :init
-  (setq evil-want-integration t
-	evil-want-C-u-scroll t
-	evil-wannt-fine-undo t
-	evil-want-keybinding nil
-	evil-disable-insert-state-bindings t)
-  :config
+(use-package evil :ensure t :defer t)
+
+(add-hook 'after-init-hook (lambda () (evil-mode 1)))
+(setq evil-want-integration t
+      evil-want-C-u-scroll t
+      evil-wannt-fine-undo t
+      evil-want-keybinding nil
+      evil-disable-insert-state-bindings t)
+(with-eval-after-load 'evil
   (evil-set-leader 'normal ",")
   (evil-set-undo-system 'undo-tree)
   (evil-define-key 'insert 'global
@@ -16,17 +14,15 @@
   (evil-define-key 'normal 'global
     (kbd "gj") 'evil-next-visual-line
     (kbd "gk") 'evil-previous-visual-line))
-
-(use-package evil-collection
-  :after evil
-  :ensure t
-  :config
+  
+;; evil-collection
+(use-package evil-collection :ensure t :defer t)
+(with-eval-after-load 'evil
   (evil-collection-init))
 
-(use-package evil-easymotion
-  :ensure t
-  :after (evil avy)
-  :config
+;; evil-easymotion
+(use-package evil-easymotion :ensure t :defer t)
+(with-eval-after-load 'evil
   (evilem-default-keybindings "SPC"))
 
 (provide 'init-evil)
-- 
cgit v1.2.3