From 196df4fb44645ce726f576f9615d7230190eb131 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Tue, 15 Mar 2022 18:25:38 +0100
Subject: [PATCH] [Emacs] Fix keybindings in Eshell

---
 org/config/emacs.org | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/org/config/emacs.org b/org/config/emacs.org
index 37f8109..c8863bf 100644
--- a/org/config/emacs.org
+++ b/org/config/emacs.org
@@ -3035,18 +3035,6 @@ though.
 (use-package eshell
   :defer t
   :straight (:type built-in :build t)
-  :general
-  (phundrak/evil
-    :keymaps 'eshell-mode-map
-    "c" #'evil-backward-char
-    "t" #'evil-next-line
-    "s" #'evil-previous-line
-    "r" #'evil-forward-char)
-  (general-define-key
-   :keymaps 'eshell-mode-map
-   :states 'insert
-   "C-a" #'eshell-bol
-   "C-e" #'end-of-line)
   :config
   (setq eshell-prompt-function
         (lambda ()
@@ -3058,7 +3046,20 @@ though.
   <<eshell-alias-open>>
   <<eshell-alias-buffers>>
   <<eshell-alias-emacs>>
-  <<eshell-alias-mkcd>>)
+  <<eshell-alias-mkcd>>
+  :general
+  (phundrak/evil
+    :keymaps 'eshell-mode-map
+    [remap evil-collection-eshell-evil-change] #'evil-backward-char
+    "t" #'evil-next-line
+    "s" #'evil-previous-line
+    "r" #'evil-forward-char
+    "h" #'evil-collection-eshell-evil-change)
+  (general-define-key
+   :keymaps 'eshell-mode-map
+   :states 'insert
+   "C-a" #'eshell-bol
+   "C-e" #'end-of-line))
 #+end_src
 
 **** Aliases