From 54f0151f6b95978a723c534cdac688a001722d4b Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 5 Mar 2023 12:34:07 -0500 Subject: [PATCH] updating keybinds --- config.el | 50 +++++++++----------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/config.el b/config.el index 1410416..966445d 100644 --- a/config.el +++ b/config.el @@ -54,18 +54,12 @@ :desc "delete current window" "d" #'delete-window) :desc "help" "h" help-map - - (:when (modulep! :ui popup) - :desc "Toggle last popup" "~" #'+popup/toggle) + :desc "Toggle last popup" "~" #'+popup/toggle :desc "Find file" "." #'find-file :desc "Switch buffer" "," #'switch-to-buffer - (:when (modulep! :ui workspaces) - :desc "Switch workspace buffer" "," #'persp-switch-to-buffer - :desc "Switch buffer" "<" #'switch-to-buffer) - :desc "Resume last search" "'" - (cond ((modulep! :completion vertico) #'vertico-repeat) - ((modulep! :completion ivy) #'ivy-resume) - ((modulep! :completion helm) #'helm-resume)) + :desc "Switch workspace buffer" "," #'persp-switch-to-buffer + :desc "Switch buffer" "<" #'switch-to-buffer + :desc "Resume last search" "'" #'vertico-repeat :desc "Search for symbol in project" "*" #'+default/search-project-for-symbol-at-point :desc "Search project" "/" #'+default/search-project @@ -150,17 +144,10 @@ (modulep! :completion helm))) :desc "List project tasks" "z" #'+taskrunner/project-tasks)) - ;;; s --- search (:prefix-map ("s" . "search") - :desc "Search buffer" "b" - (cond ((modulep! :completion vertico) #'+default/search-buffer) - ((modulep! :completion ivy) #'swiper) - ((modulep! :completion helm) #'swiper)) - :desc "Search all open buffers" "B" - (cond ((modulep! :completion vertico) (cmd!! #'consult-line-multi 'all-buffers)) - ((modulep! :completion ivy) #'swiper-all) - ((modulep! :completion helm) #'swiper-all)) + :desc "Search buffer" "b" #'+default/search-buffer + :desc "Search all open buffers" "B" (cmd!! #'consult-line-multi 'all-buffers) :desc "Search current directory" "d" #'+default/search-cwd :desc "Search other directory" "D" #'+default/search-other-cwd :desc "Search .emacs.d" "e" #'+default/search-emacsd @@ -168,7 +155,6 @@ :desc "Jump to symbol" "i" #'imenu :desc "Jump to visible link" "l" #'link-hint-open-link :desc "Jump to link" "L" #'ffap-menu - ;; :desc "Jump list" "j" #'evil-show-jumps :desc "Jump to bookmark" "m" #'bookmark-jump :desc "Look up online" "o" #'+lookup/online :desc "Look up online (w/ prompt)" "O" #'+lookup/online-select @@ -176,12 +162,8 @@ :desc "Look up in all docsets" "K" #'+lookup/in-all-docsets :desc "Search project" "p" #'+default/search-project :desc "Search other project" "P" #'+default/search-other-project - ;; :desc "Jump to mark" "r" #'evil-show-marks :desc "Search buffer" "s" #'+default/search-buffer - :desc "Search buffer for thing at point" "S" - (cond ((modulep! :completion vertico) #'+vertico/search-symbol-at-point) - ((modulep! :completion ivy) #'swiper-isearch-thing-at-point) - ((modulep! :completion helm) #'swiper-isearch-thing-at-point)) + :desc "Search buffer for thing at point" "S" #'+vertico/search-symbol-at-point :desc "Dictionary" "t" #'+lookup/dictionary-definition :desc "Thesaurus" "T" #'+lookup/synonyms) @@ -264,10 +246,7 @@ (:prefix-map ("n" . "notes") :desc "Search notes for symbol" "*" #'+default/search-notes-for-symbol-at-point (:when (modulep! :tools biblio) - :desc "Bibliographic notes" "b" - (cond ((modulep! :completion vertico) #'citar-open-notes) - ((modulep! :completion ivy) #'ivy-bibtex) - ((modulep! :completion helm) #'helm-bibtex))) + :desc "Bibliographic notes" "b" #'citar-open-notes) :desc "Find file in notes" "f" #'+default/find-in-notes :desc "Browse notes" "F" #'+default/browse-notes) @@ -276,11 +255,7 @@ :desc "Revert file" "R" #'vc-revert :desc "Copy link to remote" "y" #'+vc/browse-at-remote-kill :desc "Copy link to homepage" "Y" #'+vc/browse-at-remote-kill-homepage - (:when (modulep! :ui hydra) - :desc "SMerge" "m" #'+vc/smerge-hydra/body) (:when (modulep! :ui vc-gutter) - (:when (modulep! :ui hydra) - :desc "VCGutter" "." #'+vc/gutter-hydra/body) :desc "Revert hunk at point" "r" #'+vc-gutter/revert-hunk :desc "stage hunk at point" "s" #'+vc-gutter/stage-hunk :desc "Git time machine" "t" #'git-timemachine-toggle @@ -336,15 +311,8 @@ (:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot))) :desc "LSP Execute code action" "a" #'lsp-execute-code-action :desc "LSP Organize imports" "o" #'lsp-organize-imports - (:when (modulep! :completion ivy) - :desc "Jump to symbol in current workspace" "j" #'lsp-ivy-workspace-symbol - :desc "Jump to symbol in any workspace" "J" #'lsp-ivy-global-workspace-symbol) - (:when (modulep! :completion helm) - :desc "Jump to symbol in current workspace" "j" #'helm-lsp-workspace-symbol - :desc "Jump to symbol in any workspace" "J" #'helm-lsp-global-workspace-symbol) - (:when (modulep! :completion vertico) :desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols - :desc "Jump to symbol in any workspace" "J" (cmd!! #'consult-lsp-symbols 'all-workspaces)) + :desc "Jump to symbol in any workspace" "J" (cmd!! #'consult-lsp-symbols 'all-workspaces) (:when (modulep! :ui treemacs +lsp) :desc "Errors list" "X" #'lsp-treemacs-errors-list :desc "Incoming call hierarchy" "y" #'lsp-treemacs-call-hierarchy