4daa9271a0
+ Now uses an overriding keymap for leader keys, so that it is always
available, even outside of normal/visual states. In insert/emacs
states, or in sessions where evil is absent, an alternative prefix is
used for leader/localleader keys. See these variables:
+ doom-leader-prefix
+ doom-leader-alt-prefix
+ doom-localleader-prefix
+ doom-localleader-alt-prefix
+ Keybinds now support alternative prefixes through the new :alt-prefix
property. This is useful for non-evil users and non-normal evil
states. By default, this is M-SPC (leader) and M-SPC m (localleader).
+ Removed +evil-commands flag from config/default (moved to
feature/evil/+commands.el).
+ config/default/+bindings.el has been split into
config/default/+{evil,emacs}-bindings.el, which one is loaded depends
on whether evil is present or not. The latter is blank, but will soon
be populated with a keybinding scheme for non-evil users (perhaps
inspired by #641).
+ The define-key! macro has been replaced; it is now an alias for
general-def.
+ Added unmap! as an alias for general-unbind.
+ The following modifier key conventions are now enforced for
consistency, across all OSes:
alt/option = meta
windows/command = super
It used to be
alt/option = alt
windows/command = meta
Many of the default keybinds have been updated to reflect this switch,
but it is likely to affect personal meta/super keybinds!
The map! macro has also been rewritten to use general-define-key. Here
is what has been changed:
+ map! no longer works with characters, e.g. (map! ?x #'do-something) is
no longer supported. Keys must be kbd-able strings like "C-c x" or
vectors like [?C-c ?x].
+ The :map and :map* properties are now the same thing. If specified
keymaps aren't defined when binding keys, it is automatically
deferred.
+ The way you bind local keybinds has changed:
;; Don't do this
(map! :l "a" #'func-a
:l "b" #'func-b)
;; Do this
(map! :map 'local "a" #'func-a
"b" #'func-b)
+ map! now supports the following new blocks:
+ (:if COND THEN-FORM ELSE-FORM...)
+ (:alt-prefix PREFIX KEYS...) -- this prefix will be used for
non-normal evil states. Equivalent to :non-normal-prefix in general.
+ The way you declare a which-key label for a prefix key has changed:
;; before
(map! :desc "label" :prefix "a" ...)
;; now
(map! :prefix ("a" . "label") ...)
+ It used to be that map! supported binding a key to a key sequence,
like so:
(map! "a" [?x]) ; pressing a is like pressing x
This functionality was removed *temporarily* while I figure out the
implementation.
Addresses: #448, #814, #860
Mentioned in: #940
89 lines
3.4 KiB
EmacsLisp
89 lines
3.4 KiB
EmacsLisp
;;; config/default/config.el -*- lexical-binding: t; -*-
|
|
|
|
;; Don't store authinfo in plain text!
|
|
(setq auth-sources
|
|
(list (expand-file-name "authinfo.gpg" doom-etc-dir)
|
|
"~/.authinfo.gpg"))
|
|
|
|
(after! epa
|
|
(setq epa-file-encrypt-to
|
|
(or epa-file-encrypt-to
|
|
;; Collect all public key IDs with your username
|
|
(unless (string-empty-p user-full-name)
|
|
(cl-loop for key in (ignore-errors (epg-list-keys (epg-make-context) user-full-name))
|
|
collect (epg-sub-key-id (car (epg-key-sub-key-list key)))))
|
|
user-mail-address)
|
|
;; With GPG 2.1, this forces gpg-agent to use the Emacs minibuffer to
|
|
;; prompt for the key passphrase.
|
|
epa-pinentry-mode 'loopback))
|
|
|
|
|
|
;; disable :unless predicates with (sp-pair "'" nil :unless nil)
|
|
;; disable :post-handlers with (sp-pair "{" nil :post-handlers nil)
|
|
;; ...or specific :post-handlers with (sp-pair "{" nil :post-handlers '(:rem ("| " "SPC")))
|
|
(after! smartparens
|
|
;; Autopair quotes more conservatively; if I'm next to a word/before another
|
|
;; quote, I likely don't want another pair.
|
|
(let ((unless-list '(sp-point-before-word-p
|
|
sp-point-after-word-p
|
|
sp-point-before-same-p)))
|
|
(sp-pair "'" nil :unless unless-list)
|
|
(sp-pair "\"" nil :unless unless-list))
|
|
|
|
;; Expand {|} => { | }
|
|
;; Expand {|} => {
|
|
;; |
|
|
;; }
|
|
(dolist (brace '("(" "{" "["))
|
|
(sp-pair brace nil
|
|
:post-handlers '(("||\n[i]" "RET") ("| " "SPC"))
|
|
;; 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)))
|
|
|
|
;; Major-mode specific fixes
|
|
(sp-local-pair '(ruby-mode enh-ruby-mode) "{" "}"
|
|
:pre-handlers '(:rem sp-ruby-pre-handler)
|
|
:post-handlers '(:rem sp-ruby-post-handler))
|
|
|
|
;; 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)
|
|
"[" nil :post-handlers '(:rem ("| " "SPC")))
|
|
|
|
;; Reasonable default pairs for comments
|
|
(sp-local-pair (append sp--html-modes '(markdown-mode gfm-mode))
|
|
"<!--" "-->" :actions '(insert) :post-handlers '(("| " "SPC")))
|
|
|
|
(sp-local-pair
|
|
'(js2-mode typescript-mode rjsx-mode rust-mode
|
|
c-mode c++-mode objc-mode java-mode php-mode
|
|
css-mode scss-mode less-css-mode stylus-mode)
|
|
"/*" "*/"
|
|
:actions '(insert)
|
|
:post-handlers '(("| " "SPC") ("|\n*/[i][d-2]" "RET") ("\n* ||\n*/[i][d-2]" "*")))
|
|
|
|
;; Highjacks backspace to:
|
|
;; a) balance spaces inside brackets/parentheses ( | ) -> (|)
|
|
;; b) delete space-indented `tab-width' steps at a time
|
|
;; c) close empty multiline brace blocks in one step:
|
|
;; {
|
|
;; |
|
|
;; }
|
|
;; becomes {|}
|
|
;; d) refresh smartparens' :post-handlers, so SPC and RET expansions work
|
|
;; even after a backspace.
|
|
;; e) properly delete smartparen pairs when they are encountered, without the
|
|
;; need for strict mode.
|
|
;; f) do none of this when inside a string
|
|
(advice-add #'delete-backward-char :override #'doom/delete-backward-char)
|
|
|
|
;; Makes `newline-and-indent' smarter when dealing with comments
|
|
(advice-add #'newline-and-indent :around #'doom*newline-indent-and-continue-comments))
|
|
|
|
|
|
;;
|
|
;; Doom's keybinding scheme
|
|
|
|
(when (featurep! +bindings)
|
|
(if (featurep 'evil)
|
|
(load! "+evil-bindings")
|
|
(load! "+emacs-bindings")))
|