diff --git a/modules/app/irc/config.el b/modules/app/irc/config.el index d80a17993..f76dbeec2 100644 --- a/modules/app/irc/config.el +++ b/modules/app/irc/config.el @@ -121,21 +121,20 @@ playback.") ;; distinguish chat/channel buffers from server buffers. (add-hook 'circe-chat-mode-hook #'solaire-mode)) - (map! - (:localleader - (:map circe-mode-map - :desc "Next active buffer" :n "a" #'tracking-next-buffer - :desc "Join channel" :n "j" #'circe-command-JOIN - :desc "Send private message" :n "m" #'+irc/send-message - :desc "Part current channel" :n "p" #'circe-command-PART - :desc "Quit irc" :n "Q" #'+irc/quit - :desc "Reconnect" :n "R" #'circe-reconnect + (map! :localleader + (:map circe-mode-map + :n "a" #'tracking-next-buffer + :n "j" #'circe-command-JOIN + :n "m" #'+irc/send-message + :n "p" #'circe-command-PART + :n "Q" #'+irc/quit + :n "R" #'circe-reconnect - (:when (featurep! :completion ivy) - :desc "Jump to channel" :n "c" #'+irc/ivy-jump-to-channel)) + (:when (featurep! :completion ivy) + :n "c" #'+irc/ivy-jump-to-channel)) - (:map circe-channel-mode-map - :desc "Show names" :n "n" #'circe-command-NAMES)))) + (:map circe-channel-mode-map + :n "n" #'circe-command-NAMES))) (def-package! circe-color-nicks diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el index 0ebbc708f..d72f4c8eb 100644 --- a/modules/lang/clojure/config.el +++ b/modules/lang/clojure/config.el @@ -40,7 +40,7 @@ :config (map! :map clj-refactor-map :localleader - :desc "Refactor hydra" :n "r" #'hydra-cljr-help-menu/body)) + :n "r" #'hydra-cljr-help-menu/body)) (def-package! flycheck-joker :when (featurep! :feature syntax-checker) diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el index 8a07794fc..943bcb001 100644 --- a/modules/lang/common-lisp/config.el +++ b/modules/lang/common-lisp/config.el @@ -59,58 +59,56 @@ bin/doom while packages at compile-time (not a runtime though)." (advice-remove #'sly-check-version #'+common-lisp*refresh-sly-version)) (advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version) - ;; FIXME Buffer/mode-local :desc's don't work yet (map! :map sly-mode-map :localleader - :desc "Start Sly" :n "'" #'sly - (:desc "help" :prefix "h" - :desc "Apropos" :n "a" #'sly-apropos - :desc "Who binds" :n "b" #'sly-who-binds - :desc "Disassemble symbol" :n "d" #'sly-disassemble-symbol - :desc "Describe symbol" :n "h" #'sly-describe-symbol - :desc "HyperSpec lookup" :n "H" #'sly-hyperspec-lookup - :desc "Who macroexpands" :n "m" #'sly-who-macroexpands - :desc "Apropos package" :n "p" #'sly-apropos-package - :desc "Who references" :n "r" #'sly-who-references - :desc "Who specializes" :n "s" #'sly-who-specializes - :desc "Who sets" :n "S" #'sly-who-sets - :desc "Who calls" :n "<" #'sly-who-calls - :desc "Calls who" :n ">" #'sly-calls-who) - (:desc "compile" :prefix "c" - :desc "Compile file" :n "c" #'sly-compile-file - :desc "Compile/load file" :n "C" #'sly-compile-and-load-file - :desc "Compile defun" :n "f" #'sly-compile-defun - :desc "Load file" :n "l" #'sly-load-file - :desc "Remove notes" :n "n" #'sly-remove-notes - :desc "Compile region" :n "r" #'sly-compile-region) - (:desc "evaluate" :prefix "e" - :desc "Evaluate buffer" :n "b" #'sly-eval-buffer - :desc "Evaluate last expression" :n "e" #'sly-eval-last-expression - :desc "Evaluate/print last expression" :n "E" #'sly-eval-print-last-expression - :desc "Evaluate defun" :n "f" #'sly-eval-defun - :desc "Undefine function" :n "F" #'sly-undefine-function - :desc "Evaluate region" :n "r" #'sly-eval-region) - (:desc "go" :n "g" #'+common-lisp/navigation/body) - (:desc "macro" :prefix "m" - :desc "Macro-expand 1 level" :n "e" #'sly-macroexpand-1 - :desc "Macro-expand all" :n "E" #'sly-macroexpand-all - :desc "Macro stepper" :n "s" #'+common-lisp/macrostep/body) - (:desc "repl" :prefix "r" - :desc "Clear REPL" :n "c" #'sly-mrepl-clear-repl - :desc "Quit Lisp" :n "q" #'sly-quit-lisp - :desc "Restart Lisp" :n "r" #'sly-restart-inferior-lisp - :desc "Sync REPL" :n "s" #'sly-mrepl-sync) - (:desc "stickers" :prefix "s" - :desc "Toggle break on sticker" :n "b" #'sly-stickers-toggle-break-on-stickers - :desc "Clear defun stickers" :n "c" #'sly-stickers-clear-defun-stickers - :desc "Clear buffer stickers" :n "C" #'sly-stickers-clear-buffer-stickers - :desc "Fetch sticker recordings" :n "f" #'sly-stickers-fetch - :desc "Replay sticker recordings" :n "r" #'sly-stickers-replay - :desc "Add/remove stickers" :n "s" #'sly-stickers-dwim) - (:desc "trace" :prefix "t" - :desc "Toggle tracing" :n "t" #'sly-toggle-trace-fdefinition - :desc "Toggle fancy tracing" :n "T" #'sly-toggle-fancy-trace - :desc "Un-trace all" :n "u" #'sly-untrace-all)) + :n "'" #'sly + :n "g" #'+common-lisp/navigation/body + (:prefix "h" + :n "a" #'sly-apropos + :n "b" #'sly-who-binds + :n "d" #'sly-disassemble-symbol + :n "h" #'sly-describe-symbol + :n "H" #'sly-hyperspec-lookup + :n "m" #'sly-who-macroexpands + :n "p" #'sly-apropos-package + :n "r" #'sly-who-references + :n "s" #'sly-who-specializes + :n "S" #'sly-who-sets + :n "<" #'sly-who-calls + :n ">" #'sly-calls-who) + (:prefix "c" + :n "c" #'sly-compile-file + :n "C" #'sly-compile-and-load-file + :n "f" #'sly-compile-defun + :n "l" #'sly-load-file + :n "n" #'sly-remove-notes + :n "r" #'sly-compile-region) + (:prefix "e" + :n "b" #'sly-eval-buffer + :n "e" #'sly-eval-last-expression + :n "E" #'sly-eval-print-last-expression + :n "f" #'sly-eval-defun + :n "F" #'sly-undefine-function + :n "r" #'sly-eval-region) + (:prefix "m" + :n "e" #'macrostep-expand + :n "E" #'+common-lisp/macrostep/body) + (:prefix "r" + :n "c" #'sly-mrepl-clear-repl + :n "q" #'sly-quit-lisp + :n "r" #'sly-restart-inferior-lisp + :n "s" #'sly-mrepl-sync) + (:prefix "s" + :n "b" #'sly-stickers-toggle-break-on-stickers + :n "c" #'sly-stickers-clear-defun-stickers + :n "C" #'sly-stickers-clear-buffer-stickers + :n "f" #'sly-stickers-fetch + :n "r" #'sly-stickers-replay + :n "s" #'sly-stickers-dwim) + (:prefix "t" + :n "t" #'sly-toggle-trace-fdefinition + :n "T" #'sly-toggle-fancy-trace + :n "u" #'sly-untrace-all)) ;; Since `evil-collection-slime' exists, but not `evil-collection-sly', we ;; simply copy it diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 575a74922..eb98fe121 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -361,7 +361,7 @@ between the two." :localleader :n "d" #'org-deadline :n "t" #'org-todo - (:desc "clock" :prefix "c" + (:prefix "c" :n "c" #'org-clock-in :n "C" #'org-clock-out :n "g" #'org-clock-goto diff --git a/modules/lang/rest/config.el b/modules/lang/rest/config.el index 2ba0f1584..a9ad7b7e7 100644 --- a/modules/lang/rest/config.el +++ b/modules/lang/rest/config.el @@ -22,9 +22,9 @@ :n "zr" #'outline-show-all :localleader - :desc "Execute HTTP request" :n "e" #'restclient-http-send-current - :desc "Execute raw HTTP request" :n "E" #'restclient-http-send-current-raw - :desc "Copy curl command" :n "c" #'restclient-copy-curl-command)) + :n "e" #'restclient-http-send-current + :n "E" #'restclient-http-send-current-raw + :n "c" #'restclient-copy-curl-command)) (def-package! company-restclient diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el index 436dcc3e8..31db91490 100644 --- a/modules/lang/web/+html.el +++ b/modules/lang/web/+html.el @@ -64,62 +64,62 @@ :desc "Rehighlight buffer" :n "h" #'web-mode-buffer-highlight :desc "Indent buffer" :n "i" #'web-mode-buffer-indent - (:desc "attribute" :prefix "a" - :desc "Beginning" :n "b" #'web-mode-attribute-beginning - :desc "End" :n "e" #'web-mode-attribute-end - :desc "Insert" :n "i" #'web-mode-attribute-insert - :desc "Next" :n "n" #'web-mode-attribute-next - :desc "Select" :n "s" #'web-mode-attribute-select - :desc "Kill" :n "k" #'web-mode-attribute-kill - :desc "Previous" :n "p" #'web-mode-attribute-previous - :desc "Transpose" :n "p" #'web-mode-attribute-transpose) + (:prefix "a" + :n "b" #'web-mode-attribute-beginning + :n "e" #'web-mode-attribute-end + :n "i" #'web-mode-attribute-insert + :n "n" #'web-mode-attribute-next + :n "s" #'web-mode-attribute-select + :n "k" #'web-mode-attribute-kill + :n "p" #'web-mode-attribute-previous + :n "p" #'web-mode-attribute-transpose) - (:desc "block" :prefix "b" - :desc "Beginning" :n "b" #'web-mode-block-beginning - :desc "Close" :n "c" #'web-mode-block-close - :desc "End" :n "e" #'web-mode-block-end - :desc "Kill" :n "k" #'web-mode-block-kill - :desc "Next" :n "n" #'web-mode-block-next - :desc "Previous" :n "p" #'web-mode-block-previous - :desc "Select" :n "s" #'web-mode-block-select) + (:prefix "b" + :n "b" #'web-mode-block-beginning + :n "c" #'web-mode-block-close + :n "e" #'web-mode-block-end + :n "k" #'web-mode-block-kill + :n "n" #'web-mode-block-next + :n "p" #'web-mode-block-previous + :n "s" #'web-mode-block-select) - (:desc "dom" :prefix "d" - :desc "Replace apostrophes" :n "a" #'web-mode-dom-apostrophes-replace - :desc "Show errors" :n "d" #'web-mode-dom-errors-show - :desc "Replace entities" :n "e" #'web-mode-dom-entities-encode - :desc "Normalize" :n "n" #'web-mode-dom-normalize - :desc "Replace quotes" :n "q" #'web-mode-dom-quotes-replace - :desc "Traverse" :n "t" #'web-mode-dom-traverse - :desc "XPath" :n "x" #'web-mode-dom-xpath) + (:prefix "d" + :n "a" #'web-mode-dom-apostrophes-replace + :n "d" #'web-mode-dom-errors-show + :n "e" #'web-mode-dom-entities-encode + :n "n" #'web-mode-dom-normalize + :n "q" #'web-mode-dom-quotes-replace + :n "t" #'web-mode-dom-traverse + :n "x" #'web-mode-dom-xpath) - (:desc "element" :prefix "e" - :desc "Close" :n "/" #'web-mode-element-close - :desc "Select content" :n "a" #'web-mode-element-content-select - :desc "Beginning" :n "b" #'web-mode-element-beginning - :desc "Close" :n "c" #'web-mode-element-clone - :desc "Child" :n "d" #'web-mode-element-child - :desc "End" :n "e" #'web-mode-element-end - :desc "Toggle fold" :n "f" #'web-mode-element-children-fold-or-unfold - :desc "Insert" :n "i" #'web-mode-element-insert - :desc "Kill" :n "k" #'web-mode-element-kill - :desc "Mute blanks" :n "m" #'web-mode-element-mute-blanks - :desc "Next" :n "n" #'web-mode-element-next - :desc "Previous" :n "p" #'web-mode-element-previous - :desc "Rename" :n "r" #'web-mode-element-rename - :desc "Select" :n "s" #'web-mode-element-select - :desc "Transpose" :n "t" #'web-mode-element-transpose - :desc "Parent" :n "u" #'web-mode-element-parent - :desc "Vanish" :n "v" #'web-mode-element-vanish - :desc "Wrap" :n "w" #'web-mode-element-wrap) + (:prefix "e" + :n "/" #'web-mode-element-close + :n "a" #'web-mode-element-content-select + :n "b" #'web-mode-element-beginning + :n "c" #'web-mode-element-clone + :n "d" #'web-mode-element-child + :n "e" #'web-mode-element-end + :n "f" #'web-mode-element-children-fold-or-unfold + :n "i" #'web-mode-element-insert + :n "k" #'web-mode-element-kill + :n "m" #'web-mode-element-mute-blanks + :n "n" #'web-mode-element-next + :n "p" #'web-mode-element-previous + :n "r" #'web-mode-element-rename + :n "s" #'web-mode-element-select + :n "t" #'web-mode-element-transpose + :n "u" #'web-mode-element-parent + :n "v" #'web-mode-element-vanish + :n "w" #'web-mode-element-wrap) - (:desc "tag" :prefix "t" - :desc "Sort attributes" :n "a" #'web-mode-tag-attributes-sort - :desc "Beginning" :n "b" #'web-mode-tag-beginning - :desc "End" :n "e" #'web-mode-tag-end - :desc "Match" :n "m" #'web-mode-tag-match - :desc "Next" :n "n" #'web-mode-tag-next - :desc "Previous" :n "p" #'web-mode-tag-previous - :desc "Select" :n "s" #'web-mode-tag-select)) + (:prefix "t" + :n "a" #'web-mode-tag-attributes-sort + :n "b" #'web-mode-tag-beginning + :n "e" #'web-mode-tag-end + :n "m" #'web-mode-tag-match + :n "n" #'web-mode-tag-next + :n "p" #'web-mode-tag-previous + :n "s" #'web-mode-tag-select)) "M-/" #'web-mode-comment-or-uncomment :i "SPC" #'self-insert-command