From 3e2779da39c14cec57628578ddff74e1f45f22ec Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 14 Mar 2019 18:38:51 -0400 Subject: [PATCH] Refactor leader/localleader keybinds - Some buffer-local commands were removed from leader binds - Some more commands were added to org's localleader - Reformatted some leader keys so that lower/upper case keys are grouped together, rather than apart. - Add SPC-s-c and SPC-s-e for creating/using temporary snippets (with auto-yasnippet). --- modules/config/default/+emacs-bindings.el | 11 ++----- modules/config/default/+evil-bindings.el | 40 ++++++++++++++--------- modules/lang/org/config.el | 14 +++++++- 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index 3a0690737..b6eee73a1 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -91,21 +91,16 @@ "o" nil ; we need to unbind it first as Org claims this (:prefix ("o". "org") - :desc "Do what I mean" "o" #'+org/dwim-at-point - :desc "Sync org caldav" "s" #'org-caldav-sync (:prefix ("a" . "org agenda") :desc "Agenda" "a" #'org-agenda :desc "Todo list" "t" #'org-todo-list :desc "Tags view" "m" #'org-tags-view :desc "View search" "v" #'org-search-view) + :desc "Switch org buffers" "b" #'org-switchb :desc "Capture" "c" #'org-capture :desc "Goto capture" "C" (λ! (require 'org-capture) (call-interactively #'org-capture-goto-target)) - :desc "Switch org buffers" "b" #'org-switchb - (:prefix ("e" . "org export") - :desc "Export beamer to latex" "l b" #'org-beamer-export-to-latex - :desc "Export beamer as latex" "l B" #'org-beamer-export-as-latex - :desc "Export beamer as pdf" "l P" #'org-beamer-export-to-pdf) - :desc "Link store" "l" #'org-store-link) + :desc "Link store" "l" #'org-store-link + :desc "Sync org caldav" "s" #'org-caldav-sync) (:prefix ("q" . "quit/restart") :desc "Quit Emacs" "q" #'kill-emacs diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index e929ac74d..406421bcc 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -525,10 +525,10 @@ (:when (featurep! :feature workspaces) (:prefix ("TAB" . "workspace") :desc "Display tab bar" "TAB" #'+workspace/display + :desc "Switch workspace" "." #'+workspace/switch-to :desc "New workspace" "n" #'+workspace/new :desc "Load workspace from file" "l" #'+workspace/load :desc "Save workspace to file" "s" #'+workspace/save - :desc "Switch workspace" "." #'+workspace/switch-to :desc "Delete session" "x" #'+workspace/kill-session :desc "Delete this workspace" "d" #'+workspace/delete :desc "Rename workspace" "r" #'+workspace/rename @@ -548,8 +548,6 @@ (:prefix ("b" . "buffer") :desc "Toggle narrowing" "-" #'doom/clone-and-narrow-buffer - :desc "New empty buffer" "N" #'evil-buffer-new - :desc "Sudo edit this file" "S" #'doom/sudo-this-file :desc "Previous buffer" "[" #'previous-buffer :desc "Next buffer" "]" #'next-buffer (:when (featurep! :feature workspaces) @@ -559,41 +557,44 @@ :desc "Switch buffer" "b" #'switch-to-buffer) :desc "Kill buffer" "k" #'kill-this-buffer :desc "Next buffer" "n" #'next-buffer + :desc "New empty buffer" "N" #'evil-buffer-new :desc "Kill other buffers" "o" #'doom/kill-other-buffers :desc "Previous buffer" "p" #'previous-buffer :desc "Save buffer" "s" #'save-buffer + :desc "Sudo edit this file" "S" #'doom/sudo-this-file :desc "Pop scratch buffer" "x" #'doom/open-scratch-buffer :desc "Bury buffer" "z" #'bury-buffer) (:prefix ("c" . "code") - :desc "Jump to references" "D" #'+lookup/references - :desc "Evaluate & replace region" "E" #'+eval:replace-region - :desc "Delete trailing newlines" "W" #'doom/delete-trailing-newlines - :desc "Build tasks" "b" #'+eval/build + :desc "Compile project" "c" #'projectile-compile-project :desc "Jump to definition" "d" #'+lookup/definition + :desc "Jump to references" "D" #'+lookup/references :desc "Evaluate buffer/region" "e" #'+eval/buffer-or-region + :desc "Evaluate & replace region" "E" #'+eval:replace-region :desc "Format buffer/region" "f" #'+format/region-or-buffer :desc "Open REPL" "r" #'+eval/open-repl-other-window :desc "Delete trailing whitespace" "w" #'delete-trailing-whitespace + :desc "Delete trailing newlines" "W" #'doom/delete-trailing-newlines :desc "List errors" "x" #'flycheck-list-errors) (:prefix ("f" . "file") - :desc "Find file from here" "." (if (fboundp 'counsel-file-jump) #'counsel-file-jump #'find-file) + :desc "Find file" "." (if (fboundp 'counsel-file-jump) #'counsel-file-jump #'find-file) :desc "Find file in other project" ">" #'doom/browse-in-other-project :desc "Find file in project" "/" #'projectile-find-file :desc "Find file in other project" "?" #'doom/find-file-in-other-project - :desc "Browse emacs.d" "E" #'+default/browse-emacsd - :desc "Browse private config" "P" #'doom/open-private-config - :desc "Recent project files" "R" #'projectile-recentf - :desc "Delete this file" "X" #'doom/delete-this-file :desc "Find other file" "a" #'projectile-find-other-file :desc "Open project editorconfig" "c" #'editorconfig-find-current-editorconfig :desc "Find directory" "d" #'dired :desc "Find file in emacs.d" "e" #'+default/find-in-emacsd + :desc "Browse emacs.d" "E" #'+default/browse-emacsd + :desc "Find file from here" "f" #'find-file :desc "Find file in private config" "p" #'doom/find-file-in-private-config + :desc "Browse private config" "P" #'doom/open-private-config :desc "Recent files" "r" #'recentf-open-files + :desc "Recent project files" "R" #'projectile-recentf :desc "Save file" "s" #'save-buffer :desc "Sudo find file" "S" #'doom/sudo-find-file + :desc "Delete this file" "X" #'doom/delete-this-file :desc "Yank filename" "y" #'+default/yank-buffer-filename) (:prefix ("g" . "git") @@ -653,10 +654,17 @@ :desc "Open deft" "d" #'deft :desc "Find file in notes" "n" #'+default/find-in-notes :desc "Browse notes" "N" #'+default/browse-notes - :desc "Org capture" "x" #'org-capture) + :desc "Pop scratch buffer" "s" #'doom/open-scratch-buffer + :desc "Org capture" "x" #'org-capture + :desc "Org store link" "l" #'org-store-link) (:prefix ("o" . "open") - :desc "Org agenda" "a" #'org-agenda + :desc "Org agenda" "A" #'org-agenda + (:prefix ("a" . "org agenda") + :desc "Agenda" "a" #'org-agenda + :desc "Todo list" "t" #'org-todo-list + :desc "Tags search" "m" #'org-tags-view + :desc "View search" "v" #'org-search-view) :desc "Default browser" "b" #'browse-url-of-file :desc "Debugger" "d" #'+debug/open :desc "REPL" "r" #'+eval/open-repl-other-window @@ -736,7 +744,9 @@ :desc "Jump to mode snippet" "/" #'yas-visit-snippet-file :desc "Jump to snippet" "s" #'+snippets/find-file :desc "Browse snippets" "S" #'+snippets/browse - :desc "Reload snippets" "r" #'yas-reload-all)) + :desc "Reload snippets" "r" #'yas-reload-all + :desc "Create temporary snippet" "c" #'aya-create + :desc "Use temporary snippet" "e" #'aya-expand)) (:prefix ("t" . "toggle") :desc "Flyspell" "s" #'flyspell-mode diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 07e0bb357..559087b1c 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -426,13 +426,25 @@ between the two." :localleader :map org-mode-map "d" #'org-deadline + "b" #'org-switchb "t" #'org-todo + "T" #'org-todo-list + "l" #'org-store-link (:prefix ("c" . "clock") "c" #'org-clock-in "C" #'org-clock-out "g" #'org-clock-goto "G" (λ! (org-clock-goto 'select)) - "x" #'org-clock-cancel))) + "x" #'org-clock-cancel) + (:prefix ("e" . "export") + :desc "to markdown" "m" #'org-md-export-to-markdown + :desc "to markdown & open" "M" #'org-md-export-as-markdown + :desc "to reveal.js" "r" #'org-reveal-export-to-html + :desc "to reveal.js & open" "R" #'org-reveal-export-to-html-and-browse + (:prefix ("b" . "from beamer") + :desc "to latex" "l" #'org-beamer-export-to-latex + :desc "to latex & open" "L" #'org-beamer-export-as-latex + :desc "as pdf" "p" #'org-beamer-export-to-pdf)))) (defun +org|setup-hacks ()