From 5f2e708cd73fb5a562d770b6c7f1394414287ca5 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 12 Dec 2019 03:48:25 -0500
Subject: [PATCH] Minor refactors and reformatting

---
 modules/lang/javascript/config.el   | 24 +++++++++++++-----------
 modules/lang/org/contrib/present.el |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 45168fddf..93c839fae 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -188,7 +188,7 @@ to tide."
         :map tide-mode-map
         "R"   #'tide-restart-server
         "f"   #'tide-format
-        "rrs"  #'tide-rename-symbol
+        "rrs" #'tide-rename-symbol
         "roi" #'tide-organize-imports))
 
 
@@ -206,7 +206,8 @@ to tide."
   (when (featurep! :editor evil +everywhere)
     (let ((js2-refactor-mode-map (evil-get-auxiliary-keymap js2-refactor-mode-map 'normal t t)))
       (js2r-add-keybindings-with-prefix (format "%s r" doom-localleader-key))))
-  (map! :map js2-mode-map
+  (map! :after js2-mode
+        :map js2-mode-map
         :localleader
         (:prefix ("r" . "refactor")
           (:prefix ("a" . "add/arguments"))
@@ -235,6 +236,9 @@ to tide."
 
 ;;;###package skewer-mode
 (map! :localleader
+      (:after js2-mode
+        :map js2-mode-map
+        :prefix ("s" . "skewer"))
       :prefix "s"
       (:after skewer-mode
         :map skewer-mode-map
@@ -252,21 +256,19 @@ to tide."
       (:after skewer-html
         :map skewer-html-mode-map
         "e" #'skewer-html-eval-tag))
-(map! :map js2-mode-map
-      :localleader
-      (:prefix ("s" . "skewer")))
 
 
 ;;;###package npm-mode
 (use-package! npm-mode
   :hook ((js-mode typescript-mode) . npm-mode)
   :config
-  (map! :localleader
-        :map npm-mode-keymap
-        "n" npm-mode-command-keymap)
-  (map! :map js2-mode-map
-        :localleader
-        (:prefix ("n" . "npm"))))
+  (map! (:localleader
+          :map npm-mode-keymap
+          "n" npm-mode-command-keymap)
+        (:after js2-mode
+          :map js2-mode-map
+          :localleader
+          (:prefix ("n" . "npm")))))
 
 
 ;;
diff --git a/modules/lang/org/contrib/present.el b/modules/lang/org/contrib/present.el
index 22f2d17fb..c882c4435 100644
--- a/modules/lang/org/contrib/present.el
+++ b/modules/lang/org/contrib/present.el
@@ -13,7 +13,7 @@
 
 (use-package! org-re-reveal
   :after ox
-  :config
+  :init
   (setq org-re-reveal-root "https://cdn.jsdelivr.net/npm/reveal.js@3/"))