Evil: Set up evil-org-agenda

.emacs.d/lisp/init-evil-org.el

@@ -7,9 +7,6 @@
 ;; No need for 'insert, 'shift (I use custom definitions), 'todo 'heading.
 (evil-org-set-key-theme '(navigation textobjects additional))
 
-;; TODO: Setup evil-org-agenda when merged.
-(require 'evil-org-agenda nil t)
-
 ;;; This won't get merged upstream.  See
 ;;; https://github.com/Somelauw/evil-org-mode/issues/25.
 (defun evil-org-meta-return ()

.emacs.d/lisp/init-evil.el

@@ -172,7 +172,10 @@
 (require 'evil-ediff nil t)
 
 (when (require 'evil-org nil t)
-  (with-eval-after-load 'org (require 'init-evil-org)))
+  (with-eval-after-load 'org (require 'init-evil-org))
+  (with-eval-after-load 'org-agenda
+    (require 'evil-org-agenda)
+    (evil-org-agenda-set-keys)))
 
 (with-eval-after-load 'gnus (require 'init-evil-gnus))