From 133f0d5f308ad023b81cbef920490f619402c7b3 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 19 Oct 2019 01:46:46 -0400
Subject: [PATCH] lang/markdown: improve evil+markdown integration

---
 modules/lang/markdown/config.el   | 50 ++++++++++++++++---------------
 modules/lang/markdown/packages.el |  4 +++
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index a187d917e..9639ef093 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -56,33 +56,35 @@ capture, the end position, and the output buffer.")
     (ignore (goto-char (point-max))))
 
   (map! :map markdown-mode-map
-        :n [tab] #'markdown-cycle
+        :localleader
+        "o" #'markdown-open
+        "p" #'markdown-preview
+        "e" #'markdown-export
+        (:when (featurep! +grip)
+          "p" #'grip-mode)
+        (:prefix ("i" . "insert")
+          "t" #'markdown-toc-generate-toc
+          "i" #'markdown-insert-image
+          "l" #'markdown-insert-link)))
+
+
+(use-package! evil-markdown
+  :when (featurep! :editor evil +everywhere)
+  :hook (markdown-mode . evil-markdown-mode)
+  :config
+  (add-hook 'evil-markdown-mode-hook #'evil-normalize-keymaps)
+  (map! :map evil-markdown-mode-map
         :n "TAB" #'markdown-cycle
         :n [backtab] #'markdown-shifttab
-        :n "<S-tab>" #'markdown-shifttab
         :i "M-*" #'markdown-insert-list-item
         :i "M-b" #'markdown-insert-bold
         :i "M-i" #'markdown-insert-italic
         :i "M-`" #'+markdown/insert-del
-        (:when (featurep! :editor evil +everywhere)
-          :m "gj"  #'markdown-next-visible-heading
-          :m "gk"  #'markdown-previous-visible-heading
-          ;; TODO: Make context sensitive
-          :m "]h"  #'markdown-next-visible-heading
-          :m "[h"  #'markdown-previous-visible-heading
-          :m "[p"  #'markdown-promote
-          :m "]p"  #'markdown-demote
-          :m "[l"  #'markdown-previous-link
-          :m "]l"  #'markdown-next-link
-          :i "M--" #'markdown-insert-hr
-          :n "M-r" #'browse-url-of-file)
-        (:localleader
-          "o" #'markdown-open
-          "p" #'markdown-preview
-          "e" #'markdown-export
-          (:when (featurep! +grip)
-            "p" #'grip-mode)
-          (:prefix ("i" . "insert")
-            "t" #'markdown-toc-generate-toc
-            "i" #'markdown-insert-image
-            "l" #'markdown-insert-link))))
+        :i "M--" #'markdown-insert-hr
+        :n "M-r" #'browse-url-of-file
+        :m "]h"  #'markdown-next-visible-heading
+        :m "[h"  #'markdown-previous-visible-heading
+        :m "[p"  #'markdown-promote
+        :m "]p"  #'markdown-demote
+        :m "[l"  #'markdown-previous-link
+        :m "]l"  #'markdown-next-link))
diff --git a/modules/lang/markdown/packages.el b/modules/lang/markdown/packages.el
index b8ebb6a13..08a2b1eb3 100644
--- a/modules/lang/markdown/packages.el
+++ b/modules/lang/markdown/packages.el
@@ -7,3 +7,7 @@
 
 (when (featurep! +grip)
   (package! grip-mode))
+
+(when (featurep! :editor evil +everywhere)
+  (package! evil-markdown
+    :recipe (:host github :repo "Somelauw/evil-markdown")))