mappings fix

.doom.d/config.org

@@ -40,11 +40,9 @@ Doom Emacs uses 'SPC b' for keybindings related to bookmarks and buffers.  Bookm
 
 #+BEGIN_SRC emacs-lisp
 (map! :leader
-      :desc "List bookmarks"
+      (:prefix ("b". "buffer")
-      "b L" #'list-bookmarks
+        :desc "List bookmarks" "L" #'list-bookmarks
-      :leader
+        :desc "Save current bookmarks to bookmark file" "w" #'bookmark-save))
-      :desc "Save current bookmarks to bookmark file"
-      "b w" #'bookmark-save)
 #+END_SRC
 
 * CENTAUR-TABS
@@ -68,11 +66,8 @@ To use tabs in Doom Emacs, be sure to uncomment "tabs" in Doom's init.el.  Displ
       centaur-tabs-style "bar"
       centaur-tabs-modified-marker "•")
 (map! :leader
-      :desc "Toggle tabs globally"
+      :desc "Toggle tabs globally" "t c" #'centaur-tabs-mode
-      "t c" #'centaur-tabs-mode
+      :desc "Toggle tabs local display" "t C" #'centaur-tabs-local-mode)
-      :leader
-      :desc "Toggle tabs local display"
-      "t C" #'centaur-tabs-local-mode)
 (evil-define-key 'normal centaur-tabs-mode-map (kbd "g <right>") 'centaur-tabs-forward        ; default Doom binding is 'g t'
                                                (kbd "g <left>")  'centaur-tabs-backward       ; default Doom binding is 'g T'
                                                (kbd "g <down>")  'centaur-tabs-forward-group
@@ -95,19 +90,13 @@ Dired is the file manager within Emacs.  Below, I setup keybindings for image pr
 
 #+BEGIN_SRC emacs-lisp
 (map! :leader
-      :desc "Dired"
+      (:prefix ("d" . "dired")
-      "d d" #'dired
+       :desc "Open dired" "d" #'dired
-      :leader
+       :desc "Dired jump to current" "j" #'dired-jump)
-      :desc "Dired jump to current"
-      "d j" #'dired-jump
       (:after dired
-        (:map dired-mode-map
+       (:map dired-mode-map
-         :leader
+        :desc "Peep-dired image previews" "d p" #'peep-dired
-         :desc "Peep-dired image previews"
+        :desc "Dired view file" "d v" #'dired-view-file)))
-         "d p" #'peep-dired
-         :leader
-         :desc "Dired view file"
-         "d v" #'dired-view-file)))
 ;; Make 'h' and 'l' go back and forward in dired. Much faster to navigate the directory structure!
 (evil-define-key 'normal dired-mode-map
   (kbd "h") 'dired-up-directory
@@ -134,8 +123,7 @@ Setting the theme to doom-one.  To try out new themes, I set a keybinding for co
 #+BEGIN_SRC emacs-lisp
 (setq doom-theme 'doom-one)
 (map! :leader
-      :desc "Load new theme"
+      :desc "Load new theme" "h t" #'counsel-load-theme)
-      "h t" #'counsel-load-theme)
 #+END_SRC
 
 * ELFEED
@@ -212,20 +200,12 @@ Changing some keybindings from their defaults to better fit with Doom Emacs, and
 
 #+Begin_src emacs-lisp
 (map! :leader
-      :desc "Evaluate elisp in buffer"
+      (:prefix ("e". "evaluate/EWW")
-      "e b" #'eval-buffer
+       :desc "Evaluate elisp in buffer" "b" #'eval-buffer
-      :leader
+       :desc "Evaluate defun" "d" #'eval-defun
-      :desc "Evaluate defun"
+       :desc "Evaluate elisp expression" "e" #'eval-expression
-      "e d" #'eval-defun
+       :desc "Evaluate last sexpression" "l" #'eval-last-sexp
-      :leader
+       :desc "Evaluate elisp in region" "r" #'eval-region))
-      :desc "Evaluate elisp expression"
-      "e e" #'eval-expression
-      :leader
-      :desc "Evaluate last sexpression"
-      "e l" #'eval-last-sexp
-      :leader
-      :desc "Evaluate elisp in region"
-      "e r" #'eval-region)
 #+END_SRC
 
 * EWW
@@ -234,14 +214,10 @@ EWW is the Emacs Web Wowser, the builtin browser in Emacs.  Below I set urls to
 #+BEGIN_SRC emacs-lisp
 (setq browse-url-browser-function 'eww-browse-url)
 (map! :leader
-      :desc "Eww web browser"
+      (:prefix ("e" . "evaluate/EWW")
-      "e w" #'eww
+      :desc "Eww web browser" "e w" #'eww
-      :leader
+      :desc "Eww reload page" "e R" #'eww-reload
-      :desc "Eww reload page"
+      :desc "Search web for text between BEG/END" "s w" #'eww-search-words))
-      "e R" #'eww-reload
-      :leader
-      :desc "Search web for text between BEG/END"
-      "s w" #'eww-search-words)
 #+END_SRC
 
 * FONTS
@@ -308,11 +284,8 @@ By default, Doom Emacs does not use 'SPC v', so the format I use for these bindi
 
 #+BEGIN_SRC emacs-lisp
 (map! :leader
-      :desc "Ivy push view"
+      :desc "Ivy push view" "v p" #'ivy-push-view
-      "v p" #'ivy-push-view
+      :desc "Ivy switch view" "v s" #'ivy-switch-view)
-      :leader
-      :desc "Ivy switch view"
-      "v s" #'ivy-switch-view)
 #+END_SRC
 
 * LINE SETTINGS
@@ -329,20 +302,12 @@ I set comment-line to 'SPC TAB TAB' which is a rather comfortable keybinding for
 #+BEGIN_SRC emacs-lisp
 (setq display-line-numbers-type t)
 (map! :leader
-      :desc "Comment or uncomment lines"
+      :desc "Comment or uncomment lines" "TAB TAB" #'comment-line
-      "TAB TAB" #'comment-line
+      (:prefix ("t" . "toggle")
-      :leader
+      :desc "Toggle line numbers" "l" #'doom/toggle-line-numbers
-      :desc "Toggle line numbers"
+      :desc "Toggle line highlight in frame" "h" #'hl-line-mode
-      "t l" #'doom/toggle-line-numbers
+      :desc "Toggle line highlight globally" "H" #'global-hl-line-mode
-      :leader
+      :desc "Toggle truncate lines" "t" #'toggle-truncate-lines))
-      :desc "Toggle line highlight in frame"
-      "t h" #'hl-line-mode
-      :leader
-      :desc "Toggle line highlight globally"
-      "t H" #'global-hl-line-mode
-      :leader
-      :desc "Toggle truncate lines"
-      "t t" #'toggle-truncate-lines)
 #+END_SRC
 
 * MASTODON
@@ -468,10 +433,10 @@ The following function can be used to select an account.  This function then nee
 * NEOTREE
 Neotree is a file tree viewer.  When you open neotree, it jumps to the current file thanks to neo-smart-open.  The neo-window-fixed-size setting makes the neotree width be adjustable.  Doom Emacs had no keybindings set for neotree.  Since Doom Emacs uses 'SPC t' for 'toggle' keybindings, I used 'SPC t n' for toggle-neotree.
 
-| COMMAND        | DESCRIPTION               | KEYBINDING |
+| COMMAND        | DESCRIPTION                 | KEYBINDING |
-|----------------+---------------------------+------------|
+|----------------+-----------------------------+------------|
 | neotree-toggle | /Toggle neotree/            | SPC t n    |
-| neotree- dir   | /Open directory in neotree/ | SPC d n    |
+| neotree- dir   | /Open directory in neotree/ | SPC t N    |
 
 #+BEGIN_SRC emacs-lisp
 (after! neotree
@@ -480,11 +445,9 @@ Neotree is a file tree viewer.  When you open neotree, it jumps to the current f
 (after! doom-themes
   (setq doom-neotree-enable-variable-pitch t))
 (map! :leader
-      :desc "Toggle neotree file viewer"
+      (:prefix ("t" . "toggle")
-      "t n" #'neotree-toggle
+      :desc "Toggle neotree file viewer" "n" #'neotree-toggle
-      :leader
+      :desc "Open directory in neotree" "N" #'neotree-dir))
-      :desc "Open directory in neotree"
-      "d n" #'neotree-dir)
 #+END_SRC
 
 * OPEN SPECIFIC FILES
@@ -500,20 +463,12 @@ Keybindings to open files that I work with all the time using the find-file comm
 
 #+BEGIN_SRC emacs-lisp
 (map! :leader
-      :desc "Edit agenda file"
+      (:prefix ("-" . "open file")
-      "- a" #'(lambda () (interactive) (find-file "~/Org/agenda.org"))
+      :desc "Edit agenda file" "a" #'(lambda () (interactive) (find-file "~/Org/agenda.org"))
-      :leader
+      :desc "Edit doom config.org" "c" #'(lambda () (interactive) (find-file "~/.doom.d/config.org"))
-      :desc "Edit doom config.org"
+      :desc "Edit eshell aliases" "e" #'(lambda () (interactive) (find-file "~/.doom.d/aliases"))
-      "- c" #'(lambda () (interactive) (find-file "~/.doom.d/config.org"))
+      :desc "Edit doom init.el" "i" #'(lambda () (interactive) (find-file "~/.doom.d/init.el"))
-      :leader
+      :desc "Edit doom packages.el" "p" #'(lambda () (interactive) (find-file "~/.doom.d/packages.el")))
-      :desc "Edit eshell aliases"
-      "- e" #'(lambda () (interactive) (find-file "~/.doom.d/aliases"))
-      :leader
-      :desc "Edit doom init.el"
-      "- i" #'(lambda () (interactive) (find-file "~/.doom.d/init.el"))
-      :leader
-      :desc "Edit doom packages.el"
-      "- p" #'(lambda () (interactive) (find-file "~/.doom.d/packages.el")))
 #+END_SRC
 
 * ORG MODE
@@ -595,38 +550,18 @@ Emacs registers are compartments where you can save text, rectangles and positio
 
 #+BEGIN_SRC emacs-lisp
 (map! :leader
-      :desc "Copy to register"
+      (:prefix ("r" . "registers")
-      "r c" #'copy-to-register
+      :desc "Copy to register" "c" #'copy-to-register
-      :leader
+      :desc "Frameset to register" "f" #'frameset-to-register
-      :desc "Frameset to register"
+      :desc "Insert contents of register" "i" #'insert-register
-      "r f" #'frameset-to-register
+      :desc "Jump to register" "j" #'jump-to-register
-      :leader
+      :desc "List registers" "l" #'list-registers
-      :desc "Insert contents of register"
+      :desc "Number to register" "n" #'number-to-register
-      "r i" #'insert-register
+      :desc "Interactively choose a register" "r" #'counsel-register
-      :leader
+      :desc "View a register" "v" #'view-register
-      :desc "Jump to register"
+      :desc "Window configuration to register" "w" #'window-configuration-to-register
-      "r j" #'jump-to-register
+      :desc "Increment register" "+" #'increment-register
-      :leader
+      :desc "Point to register" "SPC" #'point-to-register))
-      :desc "List registers"
-      "r l" #'list-registers
-      :leader
-      :desc "Number to register"
-      "r n" #'number-to-register
-      :leader
-      :desc "Interactively choose a register"
-      "r r" #'counsel-register
-      :leader
-      :desc "View a register"
-      "r v" #'view-register
-      :leader
-      :desc "Window configuration to register"
-      "r w" #'window-configuration-to-register
-      :leader
-      :desc "Increment register"
-      "r +" #'increment-register
-      :leader
-      :desc "Point to register"
-      "r SPC" #'point-to-register)
 #+END_SRC
 
 * REMOTE CONNECTIONS
@@ -639,11 +574,11 @@ Keybindings for ssh'ing into remote machines.  By default, Doom Emacs does not u
 
 #+BEGIN_SRC emacs-lisp
 (map! :leader
+      (:prefix ("\\" . "ssh")
       :desc "Ssh into distrotube.com"
-      "\\ d" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.com"))
+      "d" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.com"))
-      :leader
       :desc "Ssh into my nextcloud"
-      "\\ n" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.net")))
+      "n" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.net"))))
 #+END_SRC
 
 * SHELLS
@@ -662,8 +597,7 @@ Settings for the various shells and terminal emulators within Emacs.
       eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh")
       vterm-max-scrollback 5000)
 (map! :leader
-      :desc "Counsel eshell history"
+      :desc "Counsel eshell history" "e h" #'counsel-esh-history)
-      "e h" #'counsel-esh-history)
 #+END_SRC
 
 * SPLITS
@@ -675,8 +609,7 @@ I set splits to default to opening on the right using 'prefer-horizontal-split'.
   (set-variable 'split-width-threshold 40 t)) ; make this as low as needed
 (add-hook 'markdown-mode-hook 'prefer-horizontal-split)
 (map! :leader
-      :desc "Clone indirect buffer other window"
+      :desc "Clone indirect buffer other window" "b c" #'clone-indirect-buffer-other-window)
-      "b c" #'clone-indirect-buffer-other-window)
 #+END_SRC
 
 * WINNER MODE
@@ -684,9 +617,7 @@ Winner mode has been included with GNU Emacs since version 20.  This is a global
 
 #+BEGIN_SRC emacs-lisp
 (map! :leader
-      :desc "Winner redo"
+      (:prefix ("w" . "window")
-      "w <right>" #'winner-redo
+      :desc "Winner redo" "<right>" #'winner-redo
-      :leader
+      :desc "Winner undo" "<left>" #'winner-undo))
-      :desc "Winner undo"
-      "w <left>" #'winner-undo)
 #+END_SRC