From 188415c979c4249203d66254970f3db1dd2978e2 Mon Sep 17 00:00:00 2001 From: oreodave Date: Sun, 24 Nov 2019 23:07:04 +0000 Subject: ~move the global keybinds to after statements The global keybinds (like ) that were initialised at load of config remove the benefits of lazy loading through :after statements. Thus, put them in their own after statements with better indentation. Each topic component is now a 'module' rather than a 'prefix' (e.g. Instead of 'prefix /' it is now 'counsel'). --- doom.d/config.org | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'doom.d/config.org') diff --git a/doom.d/config.org b/doom.d/config.org index 9421572..b517b8c 100644 --- a/doom.d/config.org +++ b/doom.d/config.org @@ -342,23 +342,22 @@ in Doom, so I need this binding #+BEGIN_SRC elisp (map! :leader - :desc "M-x" "" 'counsel-M-x ; Redefine as M-x because of my muscle memory with spacemacs - :desc "Switch to p-buffer" ">" 'projectile-switch-to-buffer ; Opposing < which counsel's all buffers :desc "Reload emacs" "r" 'oreodave/reload ; Reload is necessary :desc "Compile via make" "cC" '+make/run ; I compile stuff all the time - :desc "Open books" "B" 'oreodave/goto-books ; I like my books - :desc "Open school dir" "S" 'oreodave/goto-school ; I like my schooling - :desc "Find file here" "f." 'counsel-find-file ; Sometimes use this instead of ff - (:prefix "/" ; Search ; in comparison to s it's closer together, and makes more sense (vim bindings) - :after counsel - :desc "Ag!" "a" '+ivy/ag - :desc "FZF!" "f" 'counsel-fzf ; Just in case I need a counsel-ui for a gitignored directory - :desc "RipGrep!" "r" 'counsel-rg ; Ripgrep is faster than Ag in most cases and makes me feel cool - :desc "Search Tags" "t" 'counsel-etags-find-tag - :desc "List Tags" "T" 'counsel-etags-list-tag - :desc "Buffer Tags" "s" 'counsel-imenu - :desc "Search buffer" "/" 'swiper); is quicker to do than /b, for something that is done so often + (:after counsel ; Counsel or ivy + :desc "M-x" "" 'counsel-M-x ; Redefine as M-x because of my muscle memory with spacemacs + :desc "Find file here" "f." 'counsel-find-file ; Sometimes use this instead of ff + (:prefix ("/" . "search") + :desc "Ag!" "a" '+ivy/ag + :desc "FZF!" "f" 'counsel-fzf ; Just in case I need a counsel-ui for a gitignored directory + :desc "RipGrep!" "r" 'counsel-rg ; Ripgrep is faster than Ag in most cases and makes me feel cool + :desc "Search Tags" "t" 'counsel-etags-find-tag + :desc "List Tags" "T" 'counsel-etags-list-tag + :desc "Buffer Tags" "s" 'counsel-imenu + (:after online + :desc "Lookup" "o" '+lookup/online) + :desc "Search buffer" "/" 'swiper)); is quicker to do than /b, for something that is done so often (:prefix "w" ; Windows :desc "Close window" "d" '+workspace/close-window-or-workspace ; is slightly closer together than wc @@ -373,17 +372,18 @@ in Doom, so I need this binding (:prefix "b" ; Buffers :desc "Close buffer" "d" 'doom/kill-this-buffer-in-all-windows) - (:prefix "p" ; Projects - :after projectile - :desc "Regen tags" "g" 'projectile-regenerate-tags - :desc "Open project files" "f" 'projectile-find-file) + (:after projectile + :desc "Switch to p-buffer" ">" 'projectile-switch-to-buffer ; Opposing < which counsel's all buffers + (:prefix "p" + :desc "Regen tags" "g" 'projectile-regenerate-tags + :desc "Open project files" "f" 'projectile-find-file)) (:prefix ("z" . "Font") ; Fonts :desc "Increase font" "+" 'doom/increase-font-size :desc "Decrease font" "-" 'doom/decrease-font-size :desc "Adjust font" "z" 'text-scale-adjust) - (:prefix ("F" . "Frame") ; Frames + (:prefix ("F" . "frame") ; Frames :desc "Kill frame" "d" 'delete-frame :desc "Make current buffer frame" "m" 'make-frame :desc "Choose buffer to make frame" "n" 'display-buffer-other-frame -- cgit v1.2.3-13-gbd6f