From d9e58e36e9f89b7c2e17ec625f81e0cefe55067f Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 26 Jun 2018 01:46:15 +0200
Subject: [PATCH] Merge evil-org-agenda init with evil-org

---
 modules/lang/org/config.el | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 894cc623e..5089a24f9 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -30,12 +30,10 @@
   (add-hook 'evil-org-mode-hook #'evil-normalize-keymaps)
   :config
   ;; in case it is called later
-  (advice-add #'evil-org-set-key-theme :after #'+org|setup-evil))
-
-(def-package! evil-org-agenda
-  :when (featurep! :feature evil +everywhere)
-  :after org-agenda
-  :config (evil-org-agenda-set-keys))
+  (advice-add #'evil-org-set-key-theme :after #'+org|setup-evil)
+  (def-package! evil-org-agenda
+    :after org-agenda
+    :config (evil-org-agenda-set-keys)))
 
 
 ;;