1 files changed, 55 insertions, 2 deletions
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index d5f7720..8329ab0 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -52,7 +52,61 @@
     (kbd "<leader>sp") 'org-set-property
     (kbd "+") 'org-priority-up
     (kbd "-") 'org-priority-down
-    (kbd "<leader>oin") 'org-roam-node-insert))
+    (kbd "<leader>oin") 'org-roam-node-insert)
+  (evil-set-initial-state 'org-agenda-mode 'motion)
+  (evil-define-key 'motion org-agenda-mode-map
+
+    ;; motion
+    (kbd "j") 'org-agenda-next-line
+    (kbd "k") 'org-agenda-previous-line
+    (kbd "gg") 'evil-window-top
+    (kbd "G") 'evil-window-bottom
+    (kbd "C-n") 'org-agenda-next-item
+    (kbd "C-p") 'org-agenda-previous-item
+    (kbd "[[") 'org-agenda-earlier
+    (kbd "]]") 'org-agenda-later
+
+    ;; actions
+    (kbd "RET") 'org-agenda-switch-to
+    (kbd "TAB") 'org-agenda-goto
+    (kbd "t") 'org-agenda-todo
+    (kbd "r") 'org-agenda-refile
+    (kbd "+") 'org-agenda-priority-up
+    (kbd "-") 'org-agenda-priority-down
+    (kbd "H") 'org-agenda-do-date-earlier
+    (kbd "L") 'org-agenda-do-date-later
+
+    (kbd "dd") 'org-agenda-kill
+
+    ;; bulk
+    (kbd "m") 'org-agenda-bulk-toggle
+    (kbd "x") 'org-agenda-bulk-action
+
+    ;; set
+    (kbd "ss") 'org-agenda-schedule
+    (kbd "sd") 'org-agenda-deadline
+    (kbd "st") 'org-agenda-set-tags
+    (kbd "sT") 'org-timer-set-timer
+    (kbd "se") 'org-agenda-set-effort
+
+    ;; filter
+    (kbd "fc") 'org-agenda-filter-by-category
+    (kbd "fr") 'org-agenda-filter-by-regexp
+    (kbd "fe") 'org-agenda-filter-by-effort
+    (kbd "ft") 'org-agenda-filter-by-tag
+    (kbd "F") 'org-agenda-filter-remove-all
+
+    ;; clock
+    (kbd "ci") 'org-agenda-clock-in
+    (kbd "co") 'org-agenda-clock-out
+    (kbd "cc") 'org-agenda-clock-cancel
+    (kbd "cg") 'org-agenda-clock-goto
+    (kbd "cr") 'org-agenda-clockreport-mode
+
+    ;; goto
+    (kbd "gc") 'org-agenda-goto-calendar
+
+    (kbd "u") 'org-agenda-undo))
 
 (add-hook 'org-mode-hook
 	  (lambda ()
@@ -175,7 +229,6 @@
 ;; 	    (setq evil-want-C-i-jump nil)))
 (with-eval-after-load 'evil-org
   (evil-org-set-key-theme '(navigation insert textobjects additional calendar todo))
-  (evil-org-agenda-set-keys)
   (gx/diminish 'evil-org-mode))
 
 ;; roam