a few keybinding changes

This commit is contained in:
Matt Nish-Lapidus 2023-03-30 14:58:27 -04:00
parent 3299dc9f9c
commit 6ae86b5969
2 changed files with 23 additions and 19 deletions

View file

@ -3,24 +3,24 @@
(setq doom-localleader-alt-key "C-SPC") (setq doom-localleader-alt-key "C-SPC")
(map! (:when (modulep! :ui popup) (map! (:when (modulep! :ui popup)
"C-`" #'+popup/toggle "C-`" #'+popup/toggle
"C-~" #'+popup/raise "C-~" #'+popup/raise
"C-x p" #'+popup/other) "C-x p" #'+popup/other)
(:when (modulep! :ui workspaces) (:when (modulep! :ui workspaces)
(:when IS-MAC (:when IS-MAC
"s-t" #'+workspace/new "s-t" #'+workspace/new
"s-T" #'+workspace/display "s-T" #'+workspace/display
"s-1" #'+workspace/switch-to-0 "s-1" #'+workspace/switch-to-0
"s-2" #'+workspace/switch-to-1 "s-2" #'+workspace/switch-to-1
"s-3" #'+workspace/switch-to-2 "s-3" #'+workspace/switch-to-2
"s-4" #'+workspace/switch-to-3 "s-4" #'+workspace/switch-to-3
"s-5" #'+workspace/switch-to-4 "s-5" #'+workspace/switch-to-4
"s-6" #'+workspace/switch-to-5 "s-6" #'+workspace/switch-to-5
"s-7" #'+workspace/switch-to-6 "s-7" #'+workspace/switch-to-6
"s-8" #'+workspace/switch-to-7 "s-8" #'+workspace/switch-to-7
"s-9" #'+workspace/switch-to-8 "s-9" #'+workspace/switch-to-8
"s-0" #'+workspace/switch-to-final))) "s-0" #'+workspace/switch-to-final)))
(map! :leader (map! :leader
@ -330,6 +330,7 @@
:desc "Issue" "i" #'forge-create-issue :desc "Issue" "i" #'forge-create-issue
:desc "Pull request" "p" #'forge-create-pullreq))) :desc "Pull request" "p" #'forge-create-pullreq)))
;; code map
(:prefix-map ("c" . "code") (:prefix-map ("c" . "code")
(:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot))) (:when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot)))
:desc "LSP Execute code action" "a" #'lsp-execute-code-action :desc "LSP Execute code action" "a" #'lsp-execute-code-action
@ -356,6 +357,7 @@
:desc "Jump to references" "D" #'+lookup/references :desc "Jump to references" "D" #'+lookup/references
:desc "Evaluate buffer/region" "e" #'+eval/buffer-or-region :desc "Evaluate buffer/region" "e" #'+eval/buffer-or-region
:desc "Evaluate & replace region" "E" #'+eval:replace-region :desc "Evaluate & replace region" "E" #'+eval:replace-region
:desc "Toggle Fold" "z" #'+fold/toggle
:desc "Format buffer/region" "f" #'+format/region-or-buffer :desc "Format buffer/region" "f" #'+format/region-or-buffer
:desc "Find implementations" "i" #'+lookup/implementations :desc "Find implementations" "i" #'+lookup/implementations
:desc "Jump to documentation" "k" #'+lookup/documentation :desc "Jump to documentation" "k" #'+lookup/documentation
@ -381,6 +383,7 @@
:desc "Restart Emacs" "R" #'doom/restart) :desc "Restart Emacs" "R" #'doom/restart)
) )
;; some helpful general keys
(map! "s-c" #'kill-ring-save (map! "s-c" #'kill-ring-save
"s-v" #'yank "s-v" #'yank
"s-x" #'kill-region "s-x" #'kill-region
@ -395,7 +398,8 @@
"s-<up>" #'beginning-of-buffer "s-<up>" #'beginning-of-buffer
"s-<down>" #'end-of-buffer "s-<down>" #'end-of-buffer
"M-s-v" #'consult-yank-from-kill-ring "M-s-v" #'consult-yank-from-kill-ring
"s-<return>" #'split-window-below) "s-<return>" #'split-window-below
"s-<mouse-1>" #'+fold/toggle)
(after! which-key (after! which-key
(let ((prefix-re (regexp-opt (list doom-leader-key doom-leader-alt-key)))) (let ((prefix-re (regexp-opt (list doom-leader-key doom-leader-alt-key))))

View file

@ -97,7 +97,7 @@
(eval +overlay) ; run code, run (also, repls) (eval +overlay) ; run code, run (also, repls)
;;gist ; interacting with github gists ;;gist ; interacting with github gists
lookup ; navigate your code and its documentation lookup ; navigate your code and its documentation
(lsp) ; M-x vscode lsp ; M-x vscode
magit ; a git porcelain for Emacs magit ; a git porcelain for Emacs
;;make ; run make tasks from Emacs ;;make ; run make tasks from Emacs
;;pass ; password manager for nerds ;;pass ; password manager for nerds
@ -139,7 +139,7 @@
;;gdscript ; the language you waited for ;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect ;;(go +lsp) ; the hipster dialect
;;(graphql +lsp) ; Give queries a REST ;;(graphql +lsp) ; Give queries a REST
(haskell +tree-sitter) ; a language that's lazier than I am (haskell +lsp +tree-sitter) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python ;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on ;;idris ; a language you can depend on
(json +lsp +tree-sitter) ; At least it ain't XML (json +lsp +tree-sitter) ; At least it ain't XML