From a1d324762247bb327900b783a10da64d51499e03 Mon Sep 17 00:00:00 2001
From: David Florness <edwargix@gmail.com>
Date: Wed, 6 Dec 2017 21:13:36 -0700
Subject: [PATCH] Reorganize evil packages

---
 lisp/setup-evil.el | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/lisp/setup-evil.el b/lisp/setup-evil.el
index 18a0966..168d39c 100644
--- a/lisp/setup-evil.el
+++ b/lisp/setup-evil.el
@@ -35,24 +35,18 @@
 
 ;;; Evil keybindings for magit
 (use-package evil-magit
-  :after evil
+  :after (evil magit)
   :ensure t)
 
 
 ;;; Evil keybindings for org
 (use-package evil-org
-  :init
-  (progn
-	(add-hook 'org-mode-hook 'evil-org-mode)
-	(add-hook 'evil-org-mode-hook
-			  (lambda ()
-				(evil-org-set-key-theme)
-				(evil-define-key 'normal
-				  evil-org-mode-map
-				  (kbd "<return>")
-				  'evil-org-return))))
   :ensure t
-  :after org)
+  :after (evil org)
+  :hook ((org-mode . evil-org-mode)
+		 (evil-org-mode . evil-org-set-key-theme))
+  :bind ((:map evil-org-mode-map
+			   ("<ret>" . evil-org-return))))
 
 
 (provide 'setup-evil)
-- 
2.38.4