2018-02-14 23:16:38 -05:00
|
|
|
;;; config/default/config.el -*- lexical-binding: t; -*-
|
2017-12-23 02:27:42 -05:00
|
|
|
|
2018-12-23 23:57:29 -05:00
|
|
|
(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.")
|
|
|
|
|
|
|
|
|
|
|
2018-12-23 23:16:03 -05:00
|
|
|
;;
|
2019-03-09 03:41:26 -05:00
|
|
|
;;; Reasonable defaults
|
2018-06-01 17:10:30 +02:00
|
|
|
|
2017-12-27 22:48:05 -05:00
|
|
|
(after! epa
|
2018-09-21 14:06:15 -04:00
|
|
|
(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)
|
2018-09-25 10:29:57 -04:00
|
|
|
(cl-loop for key in (ignore-errors (epg-list-keys (epg-make-context) user-full-name))
|
2018-09-21 14:06:15 -04:00
|
|
|
collect (epg-sub-key-id (car (epg-key-sub-key-list key)))))
|
|
|
|
|
user-mail-address)
|
2017-12-27 22:48:05 -05:00
|
|
|
;; With GPG 2.1, this forces gpg-agent to use the Emacs minibuffer to
|
|
|
|
|
;; prompt for the key passphrase.
|
|
|
|
|
epa-pinentry-mode 'loopback))
|
|
|
|
|
|
|
|
|
|
|
2018-12-23 23:57:29 -05:00
|
|
|
;;
|
2019-03-09 03:41:26 -05:00
|
|
|
;;; Keybinding fixes
|
2018-12-23 23:57:29 -05:00
|
|
|
|
|
|
|
|
;; This section is dedicated to "fixing" certain keys so that they behave
|
|
|
|
|
;; sensibly (and consistently with similar contexts).
|
|
|
|
|
|
|
|
|
|
;; 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
|
2019-01-21 11:01:52 +01:00
|
|
|
(define-key input-decode-map [S-iso-lefttab] [backtab])
|
2019-01-21 22:09:02 -05:00
|
|
|
;; Fix conventional OS keys in Emacs
|
2019-01-22 18:03:22 -05:00
|
|
|
(map! "s-`" #'other-frame ; fix frame-switching
|
2019-01-21 22:09:02 -05:00
|
|
|
;; fix OS window/frame navigation/manipulation keys
|
2019-01-22 18:03:22 -05:00
|
|
|
"s-w" #'delete-window
|
|
|
|
|
"s-W" #'delete-frame
|
|
|
|
|
"s-n" #'+default/new-buffer
|
|
|
|
|
"s-N" #'make-frame
|
2019-01-28 20:17:37 -05:00
|
|
|
"s-q" (if (daemonp) #'delete-frame #'save-buffers-kill-terminal)
|
2019-01-28 14:23:12 -08:00
|
|
|
"C-s-f" #'toggle-frame-fullscreen
|
|
|
|
|
;; Restore somewhat common navigation
|
|
|
|
|
"s-l" #'goto-line
|
2019-01-21 22:09:02 -05:00
|
|
|
;; Restore OS undo, save, copy, & paste keys (without cua-mode, because
|
|
|
|
|
;; it imposes some other functionality and overhead we don't need)
|
2019-01-28 14:23:12 -08:00
|
|
|
"s-f" #'swiper
|
2019-01-22 18:03:22 -05:00
|
|
|
"s-z" #'undo
|
2019-01-28 14:23:12 -08:00
|
|
|
"s-Z" #'redo
|
2019-01-22 18:03:22 -05:00
|
|
|
"s-c" (if (featurep 'evil) #'evil-yank #'copy-region-as-kill)
|
|
|
|
|
"s-v" #'yank
|
|
|
|
|
"s-s" #'save-buffer
|
2019-01-21 22:09:02 -05:00
|
|
|
;; Buffer-local font scaling
|
2019-01-22 18:03:22 -05:00
|
|
|
"s-+" (λ! (text-scale-set 0))
|
|
|
|
|
"s-=" #'text-scale-increase
|
|
|
|
|
"s--" #'text-scale-decrease
|
2019-01-22 04:10:57 -05:00
|
|
|
;; Conventional text-editing keys & motions
|
2019-01-22 18:03:22 -05:00
|
|
|
"s-a" #'mark-whole-buffer
|
2019-02-21 17:46:18 -05:00
|
|
|
:g "s-/" (λ! (save-excursion (comment-line 1)))
|
|
|
|
|
:n "s-/" #'evil-commentary-line
|
|
|
|
|
:v "s-/" #'evil-commentary
|
2019-03-14 14:24:04 -04:00
|
|
|
:gni [s-return] #'+default/newline-below
|
|
|
|
|
:gni [S-s-return] #'+default/newline-above
|
2019-02-03 18:56:07 -05:00
|
|
|
:gi [s-backspace] #'doom/backward-kill-to-bol-and-indent
|
|
|
|
|
:gi [s-left] #'doom/backward-to-bol-or-indent
|
|
|
|
|
:gi [s-right] #'doom/forward-to-last-non-comment-or-eol
|
|
|
|
|
:gi [M-backspace] #'backward-kill-word
|
|
|
|
|
:gi [M-left] #'backward-word
|
|
|
|
|
:gi [M-right] #'forward-word))
|
2019-01-21 22:09:02 -05:00
|
|
|
|
2018-02-14 05:10:48 -05:00
|
|
|
|
Introduce general.el & rewrite map!
+ 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
2018-12-22 03:30:04 -05:00
|
|
|
;;
|
2019-03-09 03:41:26 -05:00
|
|
|
;;; Keybind schemes
|
2017-12-30 00:56:54 -05:00
|
|
|
|
2019-03-09 01:50:24 -05:00
|
|
|
;; Custom help keys -- these aren't under `+bindings' because they ought to be
|
|
|
|
|
;; universal.
|
|
|
|
|
(map! :map help-map
|
2019-03-13 01:37:55 -04:00
|
|
|
"'" #'describe-char
|
2019-03-09 01:50:24 -05:00
|
|
|
"a" #'apropos ; replaces `apropos-command'
|
|
|
|
|
"A" #'doom/describe-autodefs
|
|
|
|
|
"B" #'doom/open-bug-report
|
2019-03-13 01:51:53 -04:00
|
|
|
"C-c" #'describe-coding-system ; replaces `describe-copying' b/c not useful
|
2019-03-09 01:50:24 -05:00
|
|
|
"d" #'doom/describe-module ; replaces `apropos-documentation' b/c `apropos' covers this
|
|
|
|
|
"D" #'doom/open-manual
|
|
|
|
|
"E" #'doom/open-vanilla-sandbox
|
2019-03-13 01:51:53 -04:00
|
|
|
"F" #'describe-face ; replaces `Info-got-emacs-command-node' b/c redundant w/ `Info-goto-node'
|
|
|
|
|
"h" #'doom/describe-symbol ; replaces `view-hello-file' b/c annoying
|
|
|
|
|
"C-k" #'describe-key-briefly
|
2019-03-09 01:50:24 -05:00
|
|
|
"L" #'global-command-log-mode ; replaces `describe-language-environment' b/c remapped to C-l
|
|
|
|
|
"C-l" #'describe-language-environment
|
|
|
|
|
"M" #'doom/describe-active-minor-mode
|
|
|
|
|
"C-m" #'info-emacs-manual
|
|
|
|
|
"n" #'doom/open-news ; replaces `view-emacs-news' b/c it's on C-n too
|
|
|
|
|
"O" #'+lookup/online
|
|
|
|
|
"p" #'doom/describe-package ; replaces `finder-by-keyword'
|
|
|
|
|
"P" #'find-library ; replaces `describe-package' b/c redundant w/ `doom/describe-package'
|
|
|
|
|
"r" nil ; replaces `info-emacs-manual' b/c it's on C-m now
|
|
|
|
|
(:prefix "r"
|
|
|
|
|
"r" #'doom/reload
|
|
|
|
|
"t" #'doom/reload-theme
|
|
|
|
|
"p" #'doom/reload-packages
|
|
|
|
|
"f" #'doom/reload-font
|
:boom: Replace exec-path-from-shell w/ 'bin/doom env'
IMPORTANT: This is a breaking update for Mac users, as your shell
environment will no longer be inherited correctly (with the removal of
exec-path-from-shell). The quick fix is: 'bin/doom env refresh'. Also,
the set-env! autodef now does nothing (and is deprecated), be sure to
remove calls to it in your config.
Smaller changes:
+ This update also adds --no-* switches to doom quickstart
+ Includes general improvements to the documentation of several bin/doom
commands.
+ Moves doom/reload* commands to core/autoload/config.el
+ doom/reload-project has been removed (it didn't actually do anything)
The breaking change:
This update adds an "envvar file" to Doom Emacs. This file is generated
by `doom env refresh`, populated with variables scraped from your shell
environment (from both non-interactive and interactive sessions). This
file is then (inexpensively) loaded at startup, if it exists.
+ The file is manually generated with `doom env refresh`.
+ It can be regenerated automatically whenever `doom refresh` is run by
running `doom env enable` (`doom env clear` will reverse this and
delete the env file).
+ `doom quickstart` will ask if you want to auto-generate this envvar
file. You won't need it if you're confident Emacs will always be
started from the correct environment, however.
+ Your env file can be reloaded from a running Emacs session with `M-x
doom/reload-env`. Note: this won't work if the Emacs session you're
running it in doesn't have a correct SHELL set. i.e. don't use this to
create your first env file!
The idea isn't mine -- it's borrowed from Spacemacs -- and was
introduced to me in #1053 by @yurimx. I was impressed with it. Prior to
this, I was unhappy with exec-path-from-shell (no hate to the dev, I
understand its necessity), and 'doom patch-macos' wasn't ideal for mac
users (needed to be reapplied every time you update Emacs). What's more,
many users (even Linux users) had to install exec-path-from-shell
anyway.
This solution suffers from none of their shortcomings. More reliable
than patch-macos, more performant and complete than
exec-path-from-shell, and easily handled by bin/doom.
2019-03-28 00:06:10 -04:00
|
|
|
"e" #'doom/reload-env)
|
2019-03-13 01:51:53 -04:00
|
|
|
"T" #'doom/toggle-profiler
|
2019-03-09 01:50:24 -05:00
|
|
|
"V" #'set-variable
|
|
|
|
|
"C-v" #'doom/version
|
|
|
|
|
"W" #'+default/man-or-woman)
|
|
|
|
|
|
|
|
|
|
(after! which-key
|
2019-04-02 02:42:38 -04:00
|
|
|
(which-key-add-key-based-replacements doom-leader-key "<leader>")
|
|
|
|
|
(which-key-add-key-based-replacements doom-localleader-key "<localleader>")
|
|
|
|
|
|
2019-03-09 01:50:24 -05:00
|
|
|
(which-key-add-key-based-replacements "C-h r" "reload")
|
|
|
|
|
(when (featurep 'evil)
|
|
|
|
|
(which-key-add-key-based-replacements (concat doom-leader-key " r") "reload")
|
|
|
|
|
(which-key-add-key-based-replacements (concat doom-leader-alt-key " r") "reload")))
|
|
|
|
|
|
|
|
|
|
|
Introduce general.el & rewrite map!
+ 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
2018-12-22 03:30:04 -05:00
|
|
|
(when (featurep! +bindings)
|
2019-01-21 22:07:53 -05:00
|
|
|
;; Make M-x harder to miss
|
2018-12-31 15:00:05 -05:00
|
|
|
(define-key! 'override
|
2019-01-21 22:07:53 -05:00
|
|
|
"M-x" #'execute-extended-command
|
2019-01-28 21:00:41 -05:00
|
|
|
"A-x" #'execute-extended-command)
|
2018-12-31 15:00:05 -05:00
|
|
|
|
2019-03-09 03:41:26 -05:00
|
|
|
;; A Doom convention where C-s on popups and interactive searches will invoke
|
|
|
|
|
;; ivy/helm for their superior filtering.
|
|
|
|
|
(define-key! :keymaps +default-minibuffer-maps
|
|
|
|
|
"C-s" (if (featurep! :completion ivy)
|
|
|
|
|
#'counsel-minibuffer-history
|
|
|
|
|
#'helm-minibuffer-history))
|
|
|
|
|
|
2019-01-21 11:15:39 +01:00
|
|
|
;; Smarter C-a/C-e for both Emacs and Evil. 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.
|
|
|
|
|
(map! :gi "C-a" #'doom/backward-to-bol-or-indent
|
2019-01-21 22:07:31 -05:00
|
|
|
:gi "C-e" #'doom/forward-to-last-non-comment-or-eol
|
|
|
|
|
;; Standardize the behavior of M-RET/M-S-RET as a "add new item
|
|
|
|
|
;; below/above" key.
|
2019-02-03 18:56:07 -05:00
|
|
|
:gni [M-return] #'+default/newline-below
|
|
|
|
|
:gni [M-S-return] #'+default/newline-above
|
|
|
|
|
:gni [C-return] #'+default/newline-below
|
2019-03-09 03:41:26 -05:00
|
|
|
:gni [C-S-return] #'+default/newline-above))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;;; Bootstrap configs
|
2019-01-21 11:15:39 +01:00
|
|
|
|
2019-03-09 03:41:26 -05:00
|
|
|
(if (featurep 'evil)
|
|
|
|
|
(load! "+evil")
|
|
|
|
|
(load! "+emacs"))
|
