From a337c1bd4ea39c6d1c87488e01bf7c1b4091ea65 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 22 Jan 2019 18:51:45 -0500
Subject: [PATCH] lang/org: generalize newline keys

To make them available to both emacs/evil users.
---
 modules/lang/org/config.el | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 1bfaecb67..dc8b54d3d 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -318,11 +318,16 @@ between the two."
   (add-hook! 'org-tab-first-hook #'(+org|indent-maybe +org|yas-expand-maybe))
   (add-hook 'doom-delete-backward-functions #'+org|delete-backward-char-and-realign-table-maybe)
 
-  (define-key! org-mode-map
-    (kbd "C-c C-S-l") #'+org/remove-link
-    (kbd "C-c C-i")   #'org-toggle-inline-images
-    [remap doom/backward-to-bol-or-indent]          #'org-beginning-of-line
-    [remap doom/forward-to-last-non-comment-or-eol] #'org-end-of-line))
+  (map! :map org-mode-map
+        ;; textmate-esque newline insertion
+        :gi [C-return]   (λ! (+org/insert-item 'below))
+        :gi [C-S-return] (λ! (+org/insert-item 'above))
+        :gi [M-return]   (λ! (+org/insert-item 'below))
+        :gi [M-S-return] (λ! (+org/insert-item 'above))
+        "C-c C-S-l" #'+org/remove-link
+        "C-c C-i"   #'org-toggle-inline-images
+        [remap doom/backward-to-bol-or-indent]          #'org-beginning-of-line
+        [remap doom/forward-to-last-non-comment-or-eol] #'org-end-of-line))
 
 (defun +org|setup-evil (&rest args)
   ;; In case this hook is used in an advice on `evil-org-set-key-theme', this
@@ -364,11 +369,6 @@ between the two."
         ;; more intuitive RET keybinds
         :i [return] #'org-return-indent
         :n [return] #'+org/dwim-at-point
-        ;; textmate-esque newline insertion
-        :nvi [C-return]   (λ! (+org/insert-item 'below))
-        :nvi [C-S-return] (λ! (+org/insert-item 'above))
-        :nvi [M-return]   (λ! (+org/insert-item 'below))
-        :nvi [M-S-return] (λ! (+org/insert-item 'above))
         ;; more vim-esque org motion keys (not covered by evil-org-mode)
         :m "]]"  (λ! (org-forward-heading-same-level nil) (org-beginning-of-line))
         :m "[["  (λ! (org-backward-heading-same-level nil) (org-beginning-of-line))