Rethink config/default & keybindings
+ Added +smartparens flag to config/default for default smartparens config. + Fixed +tng support for completion/company. + Removed super keybinds (for all but MacOS) + Moved "keybind fixes" to config/default/config.el (these should be universally available). + Replaced both +default-repeat-forward-key and +default-repeat-backward-key with +default-repeat-keys. If this variable is nil, the universal repeat motions won't be bound.
This commit is contained in:
Henrik Lissner
parent
f9b72545b7
commit
9f2dff02fa
5 changed files with 276 additions and 259 deletions
|
|
@ -153,7 +153,6 @@
|
||||||
;;literate
|
;;literate
|
||||||
|
|
||||||
;; The default module sets reasonable defaults for Emacs. It also
|
;; The default module sets reasonable defaults for Emacs. It also
|
||||||
;; provides a Spacemacs-inspired keybinding scheme, a custom yasnippet
|
;; provides a Spacemacs-inspired keybinding scheme and a smartparens
|
||||||
;; library, and additional ex commands for evil-mode. Use it as a
|
;; config. Use it as a reference for your own modules.
|
||||||
;; reference for your own modules.
|
(default +bindings +smartparens))
|
||||||
(default +bindings))
|
|
||||||
|
|
|
||||||
|
|
@ -86,6 +86,12 @@ To have BACKENDS apply to any mode that is a parent of MODES, set MODES to
|
||||||
;;
|
;;
|
||||||
;; Commands
|
;; Commands
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun +company-has-completion-p ()
|
||||||
|
"Return non-nil if a completion candidate exists at point."
|
||||||
|
(and (company-manual-begin)
|
||||||
|
(= company-candidates-length 1)))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +company/toggle-auto-completion ()
|
(defun +company/toggle-auto-completion ()
|
||||||
"Toggle as-you-type code completion."
|
"Toggle as-you-type code completion."
|
||||||
|
|
|
||||||
|
|
@ -35,9 +35,12 @@
|
||||||
:config
|
:config
|
||||||
(add-to-list 'company-frontends 'company-tng-frontend)
|
(add-to-list 'company-frontends 'company-tng-frontend)
|
||||||
(define-key! company-active-map
|
(define-key! company-active-map
|
||||||
[return] nil
|
"RET" nil
|
||||||
[tab] #'company-select-next
|
[return] nil
|
||||||
[backtab] #'company-select-previous))
|
"TAB" #'company-select-next
|
||||||
|
[tab] #'company-select-next
|
||||||
|
"<backtab>" #'company-select-previous
|
||||||
|
[backtab] #'company-select-previous))
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
;; tell it explicitly.
|
;; tell it explicitly.
|
||||||
(setq expand-region-contract-fast-key "V")
|
(setq expand-region-contract-fast-key "V")
|
||||||
|
|
||||||
|
;; Don't let evil-collection interfere with certain keys
|
||||||
|
(setq evil-collection-key-blacklist
|
||||||
|
(list "C-j" "C-k" "gd" "gf" "K" "[" "]" "gz"
|
||||||
|
doom-leader-key doom-localleader-key
|
||||||
|
doom-leader-alt-key doom-localleader-alt-key))
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Global keybindings
|
;; Global keybindings
|
||||||
|
|
@ -20,49 +26,29 @@
|
||||||
[remap evil-jump-to-tag] #'projectile-find-tag
|
[remap evil-jump-to-tag] #'projectile-find-tag
|
||||||
[remap find-tag] #'projectile-find-tag
|
[remap find-tag] #'projectile-find-tag
|
||||||
|
|
||||||
:i [remap newline] #'newline-and-indent
|
;; Smart tab
|
||||||
:i "C-j" #'+default/newline
|
:i [tab] (general-predicate-dispatch 'indent-for-tab-command
|
||||||
|
(and (featurep! :feature snippets)
|
||||||
|
(yas-maybe-expand-abbrev-key-filter 'yas-expand))
|
||||||
|
'yas-expand
|
||||||
|
(and (featurep! :completion company +tng)
|
||||||
|
(+company-has-completion-p))
|
||||||
|
'+company/complete)
|
||||||
|
|
||||||
:n "s-+" (λ! (text-scale-set 0))
|
;; Smarter newlines
|
||||||
:n "s-=" #'text-scale-increase
|
:i [remap newline] #'newline-and-indent ; auto-indent on newline
|
||||||
:n "s--" #'text-scale-decrease
|
:i "C-j" #'+default/newline ; default behavior
|
||||||
|
|
||||||
;; Simple window/frame navigation/manipulation
|
|
||||||
:n "s-w" #'delete-window
|
|
||||||
:n "s-W" #'delete-frame
|
|
||||||
:n "C-S-f" #'toggle-frame-fullscreen
|
|
||||||
:n "s-n" #'+default/new-buffer
|
|
||||||
:n "s-N" #'make-frame
|
|
||||||
|
|
||||||
;; Textmate-esque bindings
|
|
||||||
:n "s-R" #'+eval/region-and-replace
|
|
||||||
:n "s-a" #'mark-whole-buffer
|
|
||||||
:n "s-b" #'+default/compile
|
|
||||||
:n "s-c" #'evil-yank
|
|
||||||
:n "s-f" #'swiper
|
|
||||||
:n "s-q" (if (daemonp) #'delete-frame #'evil-quit-all)
|
|
||||||
|
|
||||||
;; expand-region
|
;; expand-region
|
||||||
:v "v" #'er/expand-region
|
:v "v" #'er/expand-region
|
||||||
:v "C-v" #'er/contract-region
|
:v "C-v" #'er/contract-region
|
||||||
|
|
||||||
;; Restore OS undo, save, copy, & paste keys (without cua-mode, because it
|
(:after vc-annotate
|
||||||
;; imposes some other functionality and overhead we don't need)
|
:map vc-annotate-mode-map
|
||||||
:g "s-z" #'undo
|
[remap quit-window] #'kill-this-buffer)
|
||||||
:g "s-s" #'save-buffer
|
|
||||||
:g "s-c" #'yank
|
|
||||||
:g "s-v" #'copy-region-as-kill
|
|
||||||
:v "s-v" (if (featurep 'evil) #'evil-yank #'yank)
|
|
||||||
|
|
||||||
:nv "C-SPC" #'+evil/fold-toggle)
|
;; misc
|
||||||
|
:n "C-S-f" #'toggle-frame-fullscreen)
|
||||||
|
|
||||||
;;
|
|
||||||
;; Built-in plugins
|
|
||||||
|
|
||||||
(map! :after vc-annotate
|
|
||||||
:map vc-annotate-mode-map
|
|
||||||
[remap quit-window] #'kill-this-buffer)
|
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
@ -104,6 +90,7 @@
|
||||||
:nv "gx" #'evil-exchange
|
:nv "gx" #'evil-exchange
|
||||||
:nv "C-a" #'evil-numbers/inc-at-pt
|
:nv "C-a" #'evil-numbers/inc-at-pt
|
||||||
:nv "C-S-a" #'evil-numbers/dec-at-pt
|
:nv "C-S-a" #'evil-numbers/dec-at-pt
|
||||||
|
:nv "C-SPC" #'+evil/fold-toggle
|
||||||
:nv [tab] #'+evil/matchit-or-toggle-fold
|
:nv [tab] #'+evil/matchit-or-toggle-fold
|
||||||
:v "gp" #'+evil/paste-preserve-register
|
:v "gp" #'+evil/paste-preserve-register
|
||||||
:v "@" #'+evil:apply-macro
|
:v "@" #'+evil:apply-macro
|
||||||
|
|
@ -183,9 +170,9 @@
|
||||||
(evil-snipe-enable-incremental-highlight))))))
|
(evil-snipe-enable-incremental-highlight))))))
|
||||||
|
|
||||||
;; evil-surround
|
;; evil-surround
|
||||||
:v "S" #'evil-surround-region
|
:v "S" #'evil-surround-region
|
||||||
:o "s" #'evil-surround-edit
|
:o "s" #'evil-surround-edit
|
||||||
:o "S" #'evil-Surround-edit)
|
:o "S" #'evil-Surround-edit)
|
||||||
|
|
||||||
(:when (featurep! :feature lookup)
|
(:when (featurep! :feature lookup)
|
||||||
:nv "K" #'+lookup/documentation
|
:nv "K" #'+lookup/documentation
|
||||||
|
|
@ -200,16 +187,15 @@
|
||||||
;; yasnippet
|
;; yasnippet
|
||||||
(:after yasnippet
|
(:after yasnippet
|
||||||
(:map yas-keymap
|
(:map yas-keymap
|
||||||
"C-e" #'+snippets/goto-end-of-field
|
"C-e" #'+snippets/goto-end-of-field
|
||||||
"C-a" #'+snippets/goto-start-of-field
|
"C-a" #'+snippets/goto-start-of-field
|
||||||
"<s-right>" #'+snippets/goto-end-of-field
|
[s-right] #'+snippets/goto-end-of-field
|
||||||
"<s-left>" #'+snippets/goto-start-of-field
|
[s-left] #'+snippets/goto-start-of-field
|
||||||
"<s-backspace>" #'+snippets/delete-to-start-of-field
|
[s-backspace] #'+snippets/delete-to-start-of-field
|
||||||
[backspace] #'+snippets/delete-backward-char
|
[backspace] #'+snippets/delete-backward-char
|
||||||
[delete] #'+snippets/delete-forward-char-or-field)
|
[delete] #'+snippets/delete-forward-char-or-field)
|
||||||
(:map yas-minor-mode-map
|
(:map yas-minor-mode-map
|
||||||
:ie [tab] yas-maybe-expand
|
:v [tab] #'yas-insert-snippet)))
|
||||||
:v [tab] #'yas-insert-snippet)))
|
|
||||||
|
|
||||||
(:when (featurep! :feature spellcheck)
|
(:when (featurep! :feature spellcheck)
|
||||||
:m "]S" #'flyspell-correct-word-generic
|
:m "]S" #'flyspell-correct-word-generic
|
||||||
|
|
@ -230,18 +216,6 @@
|
||||||
:n "RET" #'flycheck-error-list-goto-error))
|
:n "RET" #'flycheck-error-list-goto-error))
|
||||||
|
|
||||||
(:when (featurep! :feature workspaces)
|
(:when (featurep! :feature workspaces)
|
||||||
:n "s-t" #'+workspace/new
|
|
||||||
:n "s-T" #'+workspace/display
|
|
||||||
:n "s-1" (λ! (+workspace/switch-to 0))
|
|
||||||
:n "s-2" (λ! (+workspace/switch-to 1))
|
|
||||||
:n "s-3" (λ! (+workspace/switch-to 2))
|
|
||||||
:n "s-4" (λ! (+workspace/switch-to 3))
|
|
||||||
:n "s-5" (λ! (+workspace/switch-to 4))
|
|
||||||
:n "s-6" (λ! (+workspace/switch-to 5))
|
|
||||||
:n "s-7" (λ! (+workspace/switch-to 6))
|
|
||||||
:n "s-8" (λ! (+workspace/switch-to 7))
|
|
||||||
:n "s-9" (λ! (+workspace/switch-to 8))
|
|
||||||
:n "s-0" #'+workspace/switch-to-last
|
|
||||||
:n "gt" #'+workspace/switch-right
|
:n "gt" #'+workspace/switch-right
|
||||||
:n "gT" #'+workspace/switch-left
|
:n "gT" #'+workspace/switch-left
|
||||||
:n "]w" #'+workspace/switch-right
|
:n "]w" #'+workspace/switch-right
|
||||||
|
|
@ -249,18 +223,18 @@
|
||||||
|
|
||||||
;;; :completion
|
;;; :completion
|
||||||
(map! (:when (featurep! :completion company)
|
(map! (:when (featurep! :completion company)
|
||||||
:i "C-@" #'+company/complete
|
:i "C-@" #'+company/complete
|
||||||
:i "C-SPC" #'+company/complete
|
:i "C-SPC" #'+company/complete
|
||||||
(:prefix "C-x"
|
(:prefix "C-x"
|
||||||
:i "C-l" #'+company/whole-lines
|
:i "C-l" #'+company/whole-lines
|
||||||
:i "C-k" #'+company/dict-or-keywords
|
:i "C-k" #'+company/dict-or-keywords
|
||||||
:i "C-f" #'company-files
|
:i "C-f" #'company-files
|
||||||
:i "C-]" #'company-etags
|
:i "C-]" #'company-etags
|
||||||
:i "s" #'company-ispell
|
:i "s" #'company-ispell
|
||||||
:i "C-s" #'company-yasnippet
|
:i "C-s" #'company-yasnippet
|
||||||
:i "C-o" #'company-capf
|
:i "C-o" #'company-capf
|
||||||
:i "C-n" #'+company/dabbrev
|
:i "C-n" #'+company/dabbrev
|
||||||
:i "C-p" #'+company/dabbrev-code-previous)
|
:i "C-p" #'+company/dabbrev-code-previous)
|
||||||
(:after company
|
(:after company
|
||||||
(:map company-active-map
|
(:map company-active-map
|
||||||
"C-w" nil ; don't interfere with `evil-delete-backward-word'
|
"C-w" nil ; don't interfere with `evil-delete-backward-word'
|
||||||
|
|
@ -294,14 +268,12 @@
|
||||||
:map ivy-minibuffer-map
|
:map ivy-minibuffer-map
|
||||||
"C-SPC" #'ivy-call-and-recenter ; preview file
|
"C-SPC" #'ivy-call-and-recenter ; preview file
|
||||||
"C-l" #'ivy-alt-done
|
"C-l" #'ivy-alt-done
|
||||||
"s-z" #'undo
|
|
||||||
"s-v" #'yank
|
|
||||||
"C-v" #'yank)
|
"C-v" #'yank)
|
||||||
(:after counsel
|
(:after counsel
|
||||||
:map counsel-ag-map
|
:map counsel-ag-map
|
||||||
[backtab] #'+ivy/wgrep-occur ; search/replace on results
|
|
||||||
"C-SPC" #'ivy-call-and-recenter ; preview
|
"C-SPC" #'ivy-call-and-recenter ; preview
|
||||||
"s-RET" (+ivy-do-action! #'+ivy-git-grep-other-window-action))
|
[backtab] #'+ivy/wgrep-occur ; search/replace on results
|
||||||
|
[C-return] (+ivy-do-action! #'+ivy-git-grep-other-window-action))
|
||||||
(:after swiper
|
(:after swiper
|
||||||
:map swiper-map
|
:map swiper-map
|
||||||
[backtab] #'+ivy/wgrep-occur))
|
[backtab] #'+ivy/wgrep-occur))
|
||||||
|
|
@ -334,20 +306,24 @@
|
||||||
"C--" #'+helm-do-ag-decrease-context
|
"C--" #'+helm-do-ag-decrease-context
|
||||||
"C-=" #'+helm-do-ag-increase-context
|
"C-=" #'+helm-do-ag-increase-context
|
||||||
[backtab] #'helm-ag-edit
|
[backtab] #'helm-ag-edit
|
||||||
[left] nil
|
[left] nil
|
||||||
[right] nil)
|
[right] nil)
|
||||||
(:after helm-files
|
(:after helm-files
|
||||||
:map (helm-find-files-map helm-read-file-map)
|
:map (helm-find-files-map helm-read-file-map)
|
||||||
[M-return] #'helm-ff-run-switch-other-window
|
[C-return] #'helm-ff-run-switch-other-window
|
||||||
"C-w" #'helm-find-files-up-one-level)
|
"C-w" #'helm-find-files-up-one-level)
|
||||||
(:after helm-locate
|
(:after helm-locate
|
||||||
:map helm-generic-files-map [M-return] #'helm-ff-run-switch-other-window)
|
:map helm-generic-files-map
|
||||||
|
[C-return] #'helm-ff-run-switch-other-window)
|
||||||
(:after helm-buffers
|
(:after helm-buffers
|
||||||
:map helm-buffer-map [M-return] #'helm-buffer-switch-other-window)
|
:map helm-buffer-map
|
||||||
|
[C-return] #'helm-buffer-switch-other-window)
|
||||||
(:after helm-regexp
|
(:after helm-regexp
|
||||||
:map helm-moccur-map [M-return] #'helm-moccur-run-goto-line-ow)
|
:map helm-moccur-map
|
||||||
|
[C-return] #'helm-moccur-run-goto-line-ow)
|
||||||
(:after helm-grep
|
(:after helm-grep
|
||||||
:map helm-grep-map [M-return] #'helm-grep-run-other-window-action))))
|
:map helm-grep-map
|
||||||
|
[C-return] #'helm-grep-run-other-window-action))))
|
||||||
|
|
||||||
;;; :ui
|
;;; :ui
|
||||||
(map! (:when (featurep! :ui hl-todo)
|
(map! (:when (featurep! :ui hl-todo)
|
||||||
|
|
@ -359,7 +335,7 @@
|
||||||
:map neotree-mode-map
|
:map neotree-mode-map
|
||||||
:n "g" nil
|
:n "g" nil
|
||||||
:n [tab] #'neotree-quick-look
|
:n [tab] #'neotree-quick-look
|
||||||
:n "RET" #'neotree-enter
|
:n [return] #'neotree-enter
|
||||||
:n [backspace] #'evil-window-prev
|
:n [backspace] #'evil-window-prev
|
||||||
:n "c" #'neotree-create-node
|
:n "c" #'neotree-create-node
|
||||||
:n "r" #'neotree-rename-node
|
:n "r" #'neotree-rename-node
|
||||||
|
|
@ -762,129 +738,78 @@
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Keybinding fixes
|
;; Universal motion repeating keys
|
||||||
|
|
||||||
;; This section is dedicated to "fixing" certain keys so that they behave
|
(defvar +default-repeat-keys (cons ";" ",")
|
||||||
;; sensibly (and consistently with similar contexts).
|
"TODO")
|
||||||
|
|
||||||
;; Make SPC u SPC u [...] possible (#747)
|
(when +default-repeat-keys
|
||||||
(define-key universal-argument-map
|
(defmacro do-repeat! (command next-func prev-func)
|
||||||
(kbd (concat doom-leader-key " u")) #'universal-argument-more)
|
"Makes ; and , the universal repeat-keys in evil-mode. These keys can be
|
||||||
|
customized by changing `+default-repeat-forward-key' and
|
||||||
|
`+default-repeat-backward-key'."
|
||||||
|
(let ((fn-sym (intern (format "+default*repeat-%s" (doom-unquote command)))))
|
||||||
|
`(progn
|
||||||
|
(defun ,fn-sym (&rest _)
|
||||||
|
(define-key! 'motion
|
||||||
|
(car +default-repeat-keys) #',next-func
|
||||||
|
(cdr +default-repeat-keys) #',prev-func))
|
||||||
|
(advice-add #',command :before #',fn-sym))))
|
||||||
|
|
||||||
(when IS-MAC
|
;; n/N
|
||||||
;; Fix MacOS shift+tab
|
(do-repeat! evil-ex-search-next evil-ex-search-next evil-ex-search-previous)
|
||||||
(define-key input-decode-map [S-iso-lefttab] [backtab])
|
(do-repeat! evil-ex-search-previous evil-ex-search-next evil-ex-search-previous)
|
||||||
;; Fix frame-switching on MacOS
|
(do-repeat! evil-ex-search-forward evil-ex-search-next evil-ex-search-previous)
|
||||||
(global-set-key (kbd "M-`") #'other-frame))
|
(do-repeat! evil-ex-search-backward evil-ex-search-next evil-ex-search-previous)
|
||||||
|
|
||||||
(defun +default|setup-input-decode-map ()
|
;; f/F/t/T/s/S
|
||||||
(define-key input-decode-map (kbd "TAB") [tab]))
|
(setq evil-snipe-repeat-keys nil
|
||||||
(add-hook 'tty-setup-hook #'+default|setup-input-decode-map)
|
evil-snipe-override-evil-repeat-keys nil) ; causes problems with remapped ;
|
||||||
|
(do-repeat! evil-snipe-f evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
(do-repeat! evil-snipe-F evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
(do-repeat! evil-snipe-t evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
(do-repeat! evil-snipe-T evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
(do-repeat! evil-snipe-s evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
(do-repeat! evil-snipe-S evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
(do-repeat! evil-snipe-x evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
(do-repeat! evil-snipe-X evil-snipe-repeat evil-snipe-repeat-reverse)
|
||||||
|
|
||||||
(after! tabulated-list
|
;; */#
|
||||||
(define-key tabulated-list-mode-map "q" #'quit-window))
|
(do-repeat! evil-visualstar/begin-search-forward
|
||||||
|
evil-ex-search-next evil-ex-search-previous)
|
||||||
(when (featurep! :feature evil +everywhere)
|
(do-repeat! evil-visualstar/begin-search-backward
|
||||||
;; Evil-collection fixes
|
evil-ex-search-previous evil-ex-search-next))
|
||||||
(setq evil-collection-key-blacklist
|
|
||||||
(list "C-j" "C-k" "gd" "gf" "K" "[" "]" "gz"
|
|
||||||
doom-leader-key doom-localleader-key))
|
|
||||||
|
|
||||||
(define-key! 'insert
|
|
||||||
;; I want C-a and C-e to be a little smarter. C-a will jump to indentation.
|
|
||||||
;; Pressing it again will send you to the true bol. Same goes for C-e,
|
|
||||||
;; except it will ignore comments and trailing whitespace before jumping to
|
|
||||||
;; eol.
|
|
||||||
"C-a" #'doom/backward-to-bol-or-indent
|
|
||||||
"C-e" #'doom/forward-to-last-non-comment-or-eol
|
|
||||||
"C-u" #'doom/backward-kill-to-bol-and-indent
|
|
||||||
;; textmate-esque newline insertion
|
|
||||||
[s-return] #'evil-open-below
|
|
||||||
[S-s-return] #'evil-open-above
|
|
||||||
;; Emacsien motions for insert mode
|
|
||||||
"C-b" #'backward-word
|
|
||||||
"C-f" #'forward-word
|
|
||||||
;; textmate-esque deletion
|
|
||||||
[s-backspace] #'doom/backward-kill-to-bol-and-indent)
|
|
||||||
|
|
||||||
(define-key! evil-ex-completion-map
|
|
||||||
"C-s" (if (featurep! :completion ivy)
|
|
||||||
#'counsel-minibuffer-history
|
|
||||||
#'helm-minibuffer-history)
|
|
||||||
"C-a" #'move-beginning-of-line
|
|
||||||
"C-b" #'backward-word
|
|
||||||
"C-f" #'forward-word)
|
|
||||||
|
|
||||||
(define-key! view-mode-map :package 'view [escape] #'View-quit-all)
|
|
||||||
|
|
||||||
(define-key! 'normal Man-mode-map :package 'man "q" #'kill-this-buffer))
|
|
||||||
|
|
||||||
;; Restore common editing keys (and ESC) in minibuffer
|
|
||||||
(let ((maps `(minibuffer-local-map
|
|
||||||
minibuffer-local-ns-map
|
|
||||||
minibuffer-local-completion-map
|
|
||||||
minibuffer-local-must-match-map
|
|
||||||
minibuffer-local-isearch-map
|
|
||||||
read-expression-map
|
|
||||||
,@(if (featurep! :completion ivy) '(ivy-minibuffer-map)))))
|
|
||||||
(define-key! :keymaps maps
|
|
||||||
"C-s" (if (featurep! :completion ivy)
|
|
||||||
#'counsel-minibuffer-history
|
|
||||||
#'helm-minibuffer-history)
|
|
||||||
"C-a" #'move-beginning-of-line
|
|
||||||
"C-w" #'backward-kill-word
|
|
||||||
"C-u" #'backward-kill-sentence
|
|
||||||
"C-b" #'backward-word
|
|
||||||
"C-f" #'forward-word
|
|
||||||
"C-z" (λ! (ignore-errors (call-interactively #'undo))))
|
|
||||||
(when (featurep! :feature evil +everywhere)
|
|
||||||
(define-key! :keymaps maps
|
|
||||||
[escape] #'abort-recursive-edit
|
|
||||||
"C-r" #'evil-paste-from-register
|
|
||||||
"C-j" #'next-line
|
|
||||||
"C-k" #'previous-line
|
|
||||||
"C-S-j" #'scroll-up-command
|
|
||||||
"C-S-k" #'scroll-down-command)))
|
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Universal motion repeating keys
|
;; Universal evil integration
|
||||||
|
|
||||||
(defvar +default-repeat-forward-key ";")
|
(when (featurep! :feature evil +everywhere)
|
||||||
(defvar +default-repeat-backward-key ",")
|
;; Restore C-a, C-e and C-u and make them a little smarter. C-a will jump to
|
||||||
|
;; indentation. Pressing it again will send you to the true bol. Same goes for
|
||||||
|
;; C-e, except it will ignore comments+trailing whitespace before jumping to
|
||||||
|
;; eol. C-u will act similarly to C-a.
|
||||||
|
(define-key!
|
||||||
|
"C-a" #'doom/backward-to-bol-or-indent
|
||||||
|
"C-e" #'doom/forward-to-last-non-comment-or-eol
|
||||||
|
"C-u" #'doom/backward-kill-to-bol-and-indent
|
||||||
|
"C-w" #'backward-kill-word)
|
||||||
|
|
||||||
(defmacro do-repeat! (command next-func prev-func)
|
(after! view
|
||||||
"Makes ; and , the universal repeat-keys in evil-mode. These keys can be
|
(define-key view-mode-map [escape] #'View-quit-all))
|
||||||
customized by changing `+default-repeat-forward-key' and
|
(after! man
|
||||||
`+default-repeat-backward-key'."
|
(define-key 'normal Man-mode-map "q" #'kill-this-buffer))
|
||||||
(let ((fn-sym (intern (format "+default*repeat-%s" (doom-unquote command)))))
|
|
||||||
`(progn
|
|
||||||
(defun ,fn-sym (&rest _)
|
|
||||||
(define-key! 'motion
|
|
||||||
+default-repeat-forward-key #',next-func
|
|
||||||
+default-repeat-backward-key #',prev-func))
|
|
||||||
(advice-add #',command :before #',fn-sym))))
|
|
||||||
|
|
||||||
;; n/N
|
;; Minibuffer
|
||||||
(do-repeat! evil-ex-search-next evil-ex-search-next evil-ex-search-previous)
|
(define-key! evil-ex-completion-map
|
||||||
(do-repeat! evil-ex-search-previous evil-ex-search-next evil-ex-search-previous)
|
"C-s" (if (featurep! :completion ivy)
|
||||||
(do-repeat! evil-ex-search-forward evil-ex-search-next evil-ex-search-previous)
|
#'counsel-minibuffer-history
|
||||||
(do-repeat! evil-ex-search-backward evil-ex-search-next evil-ex-search-previous)
|
#'helm-minibuffer-history))
|
||||||
|
|
||||||
;; f/F/t/T/s/S
|
(define-key! :keymaps +default-minibuffer-maps
|
||||||
(setq evil-snipe-repeat-keys nil
|
"C-r" #'evil-paste-from-register
|
||||||
evil-snipe-override-evil-repeat-keys nil) ; causes problems with remapped ;
|
;; Scrolling lines
|
||||||
(do-repeat! evil-snipe-f evil-snipe-repeat evil-snipe-repeat-reverse)
|
"C-j" #'next-line
|
||||||
(do-repeat! evil-snipe-F evil-snipe-repeat evil-snipe-repeat-reverse)
|
"C-k" #'previous-line
|
||||||
(do-repeat! evil-snipe-t evil-snipe-repeat evil-snipe-repeat-reverse)
|
"C-S-j" #'scroll-up-command
|
||||||
(do-repeat! evil-snipe-T evil-snipe-repeat evil-snipe-repeat-reverse)
|
"C-S-k" #'scroll-down-command))
|
||||||
(do-repeat! evil-snipe-s evil-snipe-repeat evil-snipe-repeat-reverse)
|
|
||||||
(do-repeat! evil-snipe-S evil-snipe-repeat evil-snipe-repeat-reverse)
|
|
||||||
(do-repeat! evil-snipe-x evil-snipe-repeat evil-snipe-repeat-reverse)
|
|
||||||
(do-repeat! evil-snipe-X evil-snipe-repeat evil-snipe-repeat-reverse)
|
|
||||||
|
|
||||||
;; */#
|
|
||||||
(do-repeat! evil-visualstar/begin-search-forward
|
|
||||||
evil-ex-search-next evil-ex-search-previous)
|
|
||||||
(do-repeat! evil-visualstar/begin-search-backward
|
|
||||||
evil-ex-search-previous evil-ex-search-next)
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,16 @@
|
||||||
;;; config/default/config.el -*- lexical-binding: t; -*-
|
;;; config/default/config.el -*- lexical-binding: t; -*-
|
||||||
|
|
||||||
|
(defvar +default-minibuffer-maps
|
||||||
|
`(minibuffer-local-map
|
||||||
|
minibuffer-local-ns-map
|
||||||
|
minibuffer-local-completion-map
|
||||||
|
minibuffer-local-must-match-map
|
||||||
|
minibuffer-local-isearch-map
|
||||||
|
read-expression-map
|
||||||
|
,@(if (featurep! :completion ivy) '(ivy-minibuffer-map)))
|
||||||
|
"A list of all the keymaps used for the minibuffer.")
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Reasonable defaults
|
;; Reasonable defaults
|
||||||
|
|
||||||
|
|
@ -16,72 +27,145 @@
|
||||||
epa-pinentry-mode 'loopback))
|
epa-pinentry-mode 'loopback))
|
||||||
|
|
||||||
|
|
||||||
;; disable :unless predicates with (sp-pair "'" nil :unless nil)
|
(when (featurep! +smartparens)
|
||||||
;; disable :post-handlers with (sp-pair "{" nil :post-handlers nil)
|
;; disable :unless predicates with (sp-pair "'" nil :unless nil)
|
||||||
;; ...or specific :post-handlers with (sp-pair "{" nil :post-handlers '(:rem ("| " "SPC")))
|
;; disable :post-handlers with (sp-pair "{" nil :post-handlers nil)
|
||||||
(after! smartparens
|
;; ...or specific :post-handlers with (sp-pair "{" nil :post-handlers '(:rem
|
||||||
;; Autopair quotes more conservatively; if I'm next to a word/before another
|
;; ("| " "SPC")))
|
||||||
;; quote, I likely don't want another pair.
|
(after! smartparens
|
||||||
(let ((unless-list '(sp-point-before-word-p
|
;; Autopair quotes more conservatively; if I'm next to a word/before another
|
||||||
sp-point-after-word-p
|
;; quote, I likely don't want another pair.
|
||||||
sp-point-before-same-p)))
|
(let ((unless-list '(sp-point-before-word-p
|
||||||
(sp-pair "'" nil :unless unless-list)
|
sp-point-after-word-p
|
||||||
(sp-pair "\"" nil :unless unless-list))
|
sp-point-before-same-p)))
|
||||||
|
(sp-pair "'" nil :unless unless-list)
|
||||||
|
(sp-pair "\"" nil :unless unless-list))
|
||||||
|
|
||||||
;; Expand {|} => { | }
|
;; Expand {|} => { | }
|
||||||
;; Expand {|} => {
|
;; Expand {|} => {
|
||||||
;; |
|
;; |
|
||||||
;; }
|
;; }
|
||||||
(dolist (brace '("(" "{" "["))
|
(dolist (brace '("(" "{" "["))
|
||||||
(sp-pair brace nil
|
(sp-pair brace nil
|
||||||
:post-handlers '(("||\n[i]" "RET") ("| " "SPC"))
|
:post-handlers '(("||\n[i]" "RET") ("| " "SPC"))
|
||||||
;; I likely don't want a new pair if adjacent to a word or opening brace
|
;; I likely don't want a new pair if adjacent to a word or opening brace
|
||||||
:unless '(sp-point-before-word-p sp-point-before-same-p)))
|
:unless '(sp-point-before-word-p sp-point-before-same-p)))
|
||||||
|
|
||||||
;; Major-mode specific fixes
|
;; Major-mode specific fixes
|
||||||
(sp-local-pair '(ruby-mode enh-ruby-mode) "{" "}"
|
(sp-local-pair '(ruby-mode enh-ruby-mode) "{" "}"
|
||||||
:pre-handlers '(:rem sp-ruby-pre-handler)
|
:pre-handlers '(:rem sp-ruby-pre-handler)
|
||||||
:post-handlers '(:rem sp-ruby-post-handler))
|
:post-handlers '(:rem sp-ruby-post-handler))
|
||||||
|
|
||||||
;; Don't do square-bracket space-expansion where it doesn't make sense to
|
;; Don't do square-bracket space-expansion where it doesn't make sense to
|
||||||
(sp-local-pair '(emacs-lisp-mode org-mode markdown-mode gfm-mode)
|
(sp-local-pair '(emacs-lisp-mode org-mode markdown-mode gfm-mode)
|
||||||
"[" nil :post-handlers '(:rem ("| " "SPC")))
|
"[" nil :post-handlers '(:rem ("| " "SPC")))
|
||||||
|
|
||||||
;; Reasonable default pairs for comments
|
;; Reasonable default pairs for comments
|
||||||
(sp-local-pair (append sp--html-modes '(markdown-mode gfm-mode))
|
(sp-local-pair (append sp--html-modes '(markdown-mode gfm-mode))
|
||||||
"<!--" "-->" :actions '(insert) :post-handlers '(("| " "SPC")))
|
"<!--" "-->" :actions '(insert) :post-handlers '(("| " "SPC")))
|
||||||
|
|
||||||
(sp-local-pair
|
(sp-local-pair
|
||||||
'(js2-mode typescript-mode rjsx-mode rust-mode
|
'(js2-mode typescript-mode rjsx-mode rust-mode c-mode c++-mode objc-mode
|
||||||
c-mode c++-mode objc-mode java-mode php-mode
|
java-mode php-mode css-mode scss-mode less-css-mode stylus-mode)
|
||||||
css-mode scss-mode less-css-mode stylus-mode)
|
"/*" "*/"
|
||||||
"/*" "*/"
|
:actions '(insert)
|
||||||
:actions '(insert)
|
:post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET") ("\n* ||\n*/[i][d-2]" "*")))
|
||||||
:post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET") ("\n* ||\n*/[i][d-2]" "*")))
|
|
||||||
|
|
||||||
;; Highjacks backspace to:
|
;; Highjacks backspace to:
|
||||||
;; a) balance spaces inside brackets/parentheses ( | ) -> (|)
|
;; a) balance spaces inside brackets/parentheses ( | ) -> (|)
|
||||||
;; b) delete space-indented `tab-width' steps at a time
|
;; b) delete space-indented `tab-width' steps at a time
|
||||||
;; c) close empty multiline brace blocks in one step:
|
;; c) close empty multiline brace blocks in one step:
|
||||||
;; {
|
;; {
|
||||||
;; |
|
;; |
|
||||||
;; }
|
;; }
|
||||||
;; becomes {|}
|
;; becomes {|}
|
||||||
;; d) refresh smartparens' :post-handlers, so SPC and RET expansions work
|
;; d) refresh smartparens' :post-handlers, so SPC and RET expansions work
|
||||||
;; even after a backspace.
|
;; even after a backspace.
|
||||||
;; e) properly delete smartparen pairs when they are encountered, without the
|
;; e) properly delete smartparen pairs when they are encountered, without
|
||||||
;; need for strict mode.
|
;; the need for strict mode.
|
||||||
;; f) do none of this when inside a string
|
;; f) do none of this when inside a string
|
||||||
(advice-add #'delete-backward-char :override #'doom/delete-backward-char)
|
(advice-add #'delete-backward-char :override #'doom/delete-backward-char)
|
||||||
|
|
||||||
;; Makes `newline-and-indent' smarter when dealing with comments
|
;; Makes `newline-and-indent' smarter when dealing with comments
|
||||||
(advice-add #'newline-and-indent :around #'doom*newline-indent-and-continue-comments))
|
(advice-add #'newline-and-indent :around #'doom*newline-indent-and-continue-comments)))
|
||||||
|
|
||||||
|
|
||||||
|
;;
|
||||||
|
;; Keybinding fixes
|
||||||
|
|
||||||
|
;; This section is dedicated to "fixing" certain keys so that they behave
|
||||||
|
;; sensibly (and consistently with similar contexts).
|
||||||
|
|
||||||
|
;; Make SPC u SPC u [...] possible (#747)
|
||||||
|
(map! :map universal-argument-map
|
||||||
|
:prefix doom-leader-key "u" #'universal-argument-more
|
||||||
|
:prefix doom-leader-alt-key "u" #'universal-argument-more)
|
||||||
|
|
||||||
|
(defun +default|setup-input-decode-map ()
|
||||||
|
"Ensure TAB and [tab] are treated the same in TTY Emacs."
|
||||||
|
(define-key input-decode-map (kbd "TAB") [tab]))
|
||||||
|
(add-hook 'tty-setup-hook #'+default|setup-input-decode-map)
|
||||||
|
|
||||||
|
;; Restore CUA keys in minibuffer
|
||||||
|
(define-key! :keymaps +default-minibuffer-maps
|
||||||
|
[escape] #'abort-recursive-edit
|
||||||
|
"C-v" #'yank
|
||||||
|
"C-z" (λ! (ignore-errors (call-interactively #'undo)))
|
||||||
|
"C-a" #'move-beginning-of-line
|
||||||
|
"C-b" #'backward-word
|
||||||
|
;; A Doom convention where C-s on popups and interactive searches will invoke
|
||||||
|
;; ivy/helm for their superior filtering.
|
||||||
|
"C-s" (if (featurep! :completion ivy)
|
||||||
|
#'counsel-minibuffer-history
|
||||||
|
#'helm-minibuffer-history))
|
||||||
|
|
||||||
|
;; Consistently use q to quit windows
|
||||||
|
(after! tabulated-list
|
||||||
|
(define-key tabulated-list-mode-map "q" #'quit-window))
|
||||||
|
|
||||||
|
;; OS specific fixes
|
||||||
|
(when IS-MAC
|
||||||
|
;; Fix MacOS shift+tab
|
||||||
|
(define-key input-decode-map [S-iso-lefttab] [backtab])
|
||||||
|
|
||||||
|
(define-key!
|
||||||
|
;; Buffer-local font scaling
|
||||||
|
"s-+" (λ! (text-scale-set 0))
|
||||||
|
"s-=" #'text-scale-increase
|
||||||
|
"s--" #'text-scale-decrease
|
||||||
|
;; Fix frame-switching on MacOS
|
||||||
|
"s-`" #'other-frame
|
||||||
|
;; Simple window/frame navigation/manipulation
|
||||||
|
"s-w" #'delete-window
|
||||||
|
"s-W" #'delete-frame
|
||||||
|
"s-n" #'+default/new-buffer
|
||||||
|
"s-N" #'make-frame
|
||||||
|
;; Textmate-esque bindings
|
||||||
|
"s-a" #'mark-whole-buffer
|
||||||
|
"s-b" #'+default/compile
|
||||||
|
"s-f" #'swiper
|
||||||
|
"s-q" (if (daemonp) #'delete-frame #'evil-quit-all)
|
||||||
|
;; Restore OS undo, save, copy, & paste keys (without cua-mode, because
|
||||||
|
;; it imposes some other functionality and overhead we don't need)
|
||||||
|
"s-z" #'undo
|
||||||
|
"s-s" #'save-buffer
|
||||||
|
"s-c" (if (featurep 'evil) 'evil-yank 'copy-region-as-kill)
|
||||||
|
"s-v" #'yank
|
||||||
|
;; textmate-esque newline insertion
|
||||||
|
[s-return] #'evil-open-below
|
||||||
|
[S-s-return] #'evil-open-above
|
||||||
|
;; textmate-esque deletion
|
||||||
|
[s-backspace] #'doom/backward-kill-to-bol-and-indent))
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Doom's keybinding scheme
|
;; Doom's keybinding scheme
|
||||||
|
|
||||||
(when (featurep! +bindings)
|
(when (featurep! +bindings)
|
||||||
|
;; Ensure Emacsien motions are available
|
||||||
|
(map! "C-b" #'backward-word
|
||||||
|
"C-f" #'forward-word)
|
||||||
|
|
||||||
(if (featurep 'evil)
|
(if (featurep 'evil)
|
||||||
(load! "+evil-bindings")
|
(load! "+evil-bindings")
|
||||||
(load! "+emacs-bindings")))
|
(load! "+emacs-bindings")))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue