Org configuration changes

init.el

@@ -180,19 +180,10 @@
     (org-agenda-day-view)))
 ;For Org-Agenda, you can set a location of your Org Agenda file here. Set Agenda Directory:
 (use-package org
-  ;:ensure (:wait t)
    :ensure nil
-  :demand t
+   :demand t ; Setting org mode to be deferred absolutely breaks everything, with org-agenda-mode-map error. Please switch to eval after load maybe instead.
-  :after evil
    :hook
         (org-agenda-mode . (lambda() (org-agenda-entry-text-mode 1)))
-  :bind
-    (:map org-agenda-mode-map
-      ("C-j" . evil-next-line)
-      ("C-k" . evil-previous-line)
-      ("d" . org-agenda-toggle-day-view)
-     :map evil-normal-state-map
-      ("U" . undo-redo))
    :config
         (setq org-agenda-files '("~/Nextcloud/Agenda"))
         ;This is will integrate the Calendar/Diary into Org-Agenda, so you can get access to dates on public holidays etc. Set diary to true:
@@ -211,6 +202,18 @@
         (setq org-fold-core-style 'overlays)
         (setq org-startup-folded t)
         (setq org-hide-emphasis-markers nil))
+(with-eval-after-load 'org
+    (with-eval-after-load 'evil
+        ; Unbind stubborn org mode bindings
+        (define-key org-mode-map (kbd "M-h") nil)
+        (define-key org-mode-map (kbd "M-l") nil)
+        (evil-define-key* '(normal) org-mode-map (kbd "M-h") nil)
+        (evil-define-key* '(normal) org-mode-map (kbd "M-l") nil)))
+(with-eval-after-load 'org-agenda
+    (define-key org-agenda-mode-map (kbd "C-j") 'evil-next-line)
+    (define-key org-agenda-mode-map (kbd "C-k") 'evil-previous-line)
+    (define-key org-agenda-mode-map "d" 'org-agenda-toggle-day-view)
+    (define-key org-agenda-mode-map "p" 'org-pomodoro))
 
 ; For Org Pomodoro notification sound
 (use-package sound-wav
@@ -219,8 +222,7 @@
 ; Org Pomodoro
 (use-package org-pomodoro
     :ensure t
-  :after org
+    :after (org sound-wav)
-  :defer t
     :config
         (setq org-pomodoro-manual-break t)
         (setq org-pomodoro-keep-killed-pomodoro-time t)