Minimize dependence on map!

This is in preparation for general.el integration coming in 2.1.1. It is
very likely that map! will change (and even more, be split into several
macros). Not much, but change none-the-less. Specifically, the state
keywords (e.g. :nvi, :n, :i) will be removed in favor of a :state
property that takes a list, e.g. (normal visual insert).

In any case, both map! and general are also relatively expensive
compared to define-key and evil-define-key* (and the new define-key!
macro), so use that when we can.

This also means changes to either API won't affect Doom's modules in the
long term.

modules/app/calendar/config.el

@@ -27,7 +27,7 @@
         cfw:fchar-top-left-corner ?┏
         cfw:fchar-top-right-corner ?┓)
 
-  (map! :map cfw:calendar-mode-map "q" #'+calendar/quit)
+  (define-key cfw:calendar-mode-map "q" #'+calendar/quit)
 
   (when (featurep 'solaire-mode)
     (add-hook 'cfw:calendar-mode-hook #'solaire-mode))

modules/app/irc/config.el

@@ -103,7 +103,7 @@ playback.")
   (advice-add 'circe--irc-conn-disconnected :after #'+irc*circe-disconnect-hook)
 
   ;; Let `+irc/quit' and `circe' handle buffer cleanup
-  (map! :map circe-mode-map [remap kill-buffer] #'bury-buffer)
+  (define-key circe-mode-map [remap kill-buffer] #'bury-buffer)
 
   (defun +irc*circe-truncate-nicks ()
     "Truncate long nicknames in chat output non-destructively."
@@ -163,7 +163,7 @@ playback.")
 (def-package! lui
   :commands lui-mode
   :config
-  (map! :map lui-mode-map "C-u" #'lui-kill-to-beginning-of-line)
+  (define-key lui-mode-map "\C-u" #'lui-kill-to-beginning-of-line)
   (when (featurep! :feature spellcheck)
     (setq lui-flyspell-p t
           lui-fill-type nil))

modules/app/rss/config.el

@@ -39,23 +39,24 @@ paths.")
   ;; Enhance readability of a post
   (add-hook 'elfeed-show-mode-hook #'+rss|elfeed-wrap)
 
-  (map! (:map (elfeed-search-mode-map elfeed-show-mode-map)
-          [remap kill-this-buffer] #'+rss/quit
-          [remap kill-buffer]      #'+rss/quit)
-
-        (:map elfeed-search-mode-map
-          :n "q"     #'+rss/quit
-          :n "r"     #'elfeed-update
-          :n "s"     #'elfeed-search-live-filter
-          :n "RET"   #'elfeed-search-show-entry
-          :n "M-RET" #'elfeed-search-browse-url)
-
-        (:map elfeed-show-mode-map
-          :n "q"  #'elfeed-kill-buffer
-          :m "j"  #'evil-next-visual-line
-          :m "k"  #'evil-previous-visual-line
-          [remap next-buffer]     #'+rss/next
-          [remap previous-buffer] #'+rss/previous)))
+  (define-key! (elfeed-search-mode-map elfeed-show-mode-map)
+    [remap kill-this-buffer] #'+rss/quit
+    [remap kill-buffer]      #'+rss/quit)
+  (define-key! elfeed-show-mode-map
+    [remap next-buffer]     #'+rss/next
+    [remap previous-buffer] #'+rss/previous)
+  (when (featurep 'evil)
+    (evil-define-key* 'normal elfeed-search-mode-map
+      "q"     #'+rss/quit
+      "r"     #'elfeed-update
+      "s"     #'elfeed-search-live-filter
+      (kbd "RET")   #'elfeed-search-show-entry
+      (kbd "M-RET") #'elfeed-search-browse-url)
+    (evil-define-key* 'normal elfeed-show-mode-map
+      "q"  #'elfeed-kill-buffer)
+    (evil-define-key* 'motion elfeed-show-mode-map
+      "j"  #'evil-next-visual-line
+      "k"  #'evil-previous-visual-line)))
 
 
 (def-package! elfeed-org

modules/app/twitter/config.el

@@ -52,28 +52,29 @@
           mode-line-format nil))
   (add-hook 'twittering-mode-hook #'+twitter|switch-mode-and-header-line)
 
-  (map! :map twittering-mode-map
-        "q"   #'+twitter/quit
-        "Q"   #'+twitter/quit-all
-        [remap twittering-kill-buffer] #'+twitter/quit
-        [remap delete-window]          #'+twitter/quit
-        [remap +workspace/close-window-or-workspace] #'+twitter/quit
-        (:when (featurep! :feature evil)
-          [remap evil-window-delete] #'+twitter/quit
-          "f"   #'twittering-favorite
-          "F"   #'twittering-unfavorite
-          "C-f" #'twittering-follow
-          "C-F" #'twittering-unfollow
-          "d"   #'twittering-delete-status
-          "r"   #'twittering-retweet
-          "R"   #'twittering-toggle-or-retrieve-replied-statuses
-          "o"   #'twittering-update-status-interactive
-          "O"   #'+twitter/ace-link
-          "/"   #'twittering-search
-          "J"   #'twittering-goto-next-status
-          "K"   #'twittering-goto-previous-status
-          "g"   nil
-          "gg"  #'twittering-goto-first-status
-          "G"   #'twittering-goto-last-status
-          "gj"  #'twittering-goto-next-status-of-user
-          "gk"  #'twittering-goto-previous-status-of-user)))
+  (define-key! twittering-mode-map
+    "q" #'+twitter/quit
+    "Q" #'+twitter/quit-all
+    [remap twittering-kill-buffer] #'+twitter/quit
+    [remap delete-window]          #'+twitter/quit
+    [remap +workspace/close-window-or-workspace] #'+twitter/quit)
+  (when (featurep! :feature evil +everywhere)
+    (define-key! twittering-mode-map
+      [remap evil-window-delete] #'+twitter/quit
+      "f"    #'twittering-favorite
+      "F"    #'twittering-unfavorite
+      "\C-f" #'twittering-follow
+      "\C-F" #'twittering-unfollow
+      "d"    #'twittering-delete-status
+      "r"    #'twittering-retweet
+      "R"    #'twittering-toggle-or-retrieve-replied-statuses
+      "o"    #'twittering-update-status-interactive
+      "O"    #'+twitter/ace-link
+      "/"    #'twittering-search
+      "J"    #'twittering-goto-next-status
+      "K"    #'twittering-goto-previous-status
+      "g"    nil
+      "gg"   #'twittering-goto-first-status
+      "G"    #'twittering-goto-last-status
+      "gj"   #'twittering-goto-next-status-of-user
+      "gk"   #'twittering-goto-previous-status-of-user)))