From 56a16160010760a3627fdb30aedcce0dd888cd9d Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@proton.me>
Date: Fri, 7 Jun 2024 23:34:07 +0200
Subject: [PATCH] fix: magit commit initial insert mode

---
 init.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/init.el b/init.el
index 8966514..ea41460 100644
--- a/init.el
+++ b/init.el
@@ -95,8 +95,6 @@
 (my-use-package evil
   :ensure t
   :demand t
-  :hook
-  (with-editor-mode-hook . evil-insert-state)
   :general
   (my-leader
     "u" '(universal-argument :wk "Universal argument"))
@@ -397,6 +395,8 @@
   :ensure t)
 (my-use-package magit
   :ensure t
+  :hook
+  (with-editor-mode-hook . evil-insert-state)
   :general
   (my-leader
     "g" '(nil :wk "Magit")
@@ -409,7 +409,9 @@
   ;; I don't know why, but if this is in :custom block,
   ;; magit-dispatch ends up in an error...
   (setq evil-collection-magit-want-horizontal-movement t)
-  )
+
+  (evil-set-initial-state #'git-commit-mode 'insert))
+
 (my-use-package hl-todo
   :ensure (:pin t :tag "v3.6.0"))
 (my-use-package magit-todos
-- 
2.48.1