From 762435acb4422ef578fa8aba0417282a747ece96 Mon Sep 17 00:00:00 2001
From: Daneel <daneel@sukany.cz>
Date: Tue, 24 Feb 2026 23:18:07 +0100
Subject: [PATCH] fix calfw: normal state + evil-define-key rebind (SPC=leader,
 q=bury, navigace funguje)

---
 config.el | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/config.el b/config.el
index a52b6a0..792ecfb 100644
--- a/config.el
+++ b/config.el
@@ -1934,9 +1934,29 @@ current frame."
 (use-package! calfw-org
   :demand t
   :config
-  ;; Evil přebírá klávesy — calfw musí být v emacs-state (haji-ali fork)
-  (evil-set-initial-state 'calfw-calendar-mode 'emacs)
-  (evil-set-initial-state 'calfw-details-mode 'emacs)
+  ;; calfw v normal state → SPC = Doom leader (SPC b d, SPC b b atd. fungují)
+  ;; V emacs-state SPC zachytí calfw lokální mapa → nelze použít Doom leader
+  ;; Řešení: normal state + explicitní rebind calfw navigace (overriduje evil defaults)
+  (evil-set-initial-state 'calfw-calendar-mode 'normal)
+  (evil-set-initial-state 'calfw-details-mode 'normal)
+  (evil-define-key 'normal calfw-calendar-mode-map
+    "h"   #'calfw-navi-previous-day-command
+    "l"   #'calfw-navi-next-day-command
+    "j"   #'calfw-navi-next-week-command
+    "k"   #'calfw-navi-previous-week-command
+    "n"   #'calfw-navi-next-week-command
+    "p"   #'calfw-navi-previous-week-command
+    "t"   #'calfw-navi-goto-today-command
+    "g"   #'calfw-refresh-calendar-buffer
+    "W"   #'calfw-change-view-week
+    "M"   #'calfw-change-view-month
+    "D"   #'calfw-change-view-day
+    "TAB" #'calfw-navi-next-item-command
+    "q"   #'bury-buffer
+    "x"   #'calfw-org-clean-exit
+    "RET" #'calfw-org-open-agenda-day
+    "<"   #'calfw-navi-prev-view
+    ">"   #'calfw-navi-next-view)
 
   (defun my/open-calendar ()
     "Calfw — stabilní verze, org-agenda-files."