emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
doomemacs/modules/config/default/config.el

135 lines
5.2 KiB
EmacsLisp
Raw Normal View History

:boom: Move :private modules to :config
2018-02-14 23:16:38 -05:00
;;; config/default/config.el -*- lexical-binding: t; -*-
Add private/default This will replace private/hlissner. Addresses #301
2017-12-23 02:27:42 -05:00
:boom: Change first arg of load! macro load!'s first argument is no longer a symbol (that will cause void-variable errors now) to save on unnecessary interning and simplify compile-time logic. It accepts any valid form that evaluates to a string now. If you use load!, you need to change its argument to a string! e.g. (load! +my-module) => (load! "+my-module")
2018-05-27 12:44:22 +02:00
(if (featurep! +bindings) (load! "+bindings"))
private/default: refactor into multiple files + add evil checks
2017-12-30 00:56:54 -05:00
Rearrange core config, epa & authinfo bits (fix after! error)
2017-12-27 22:48:05 -05:00
;;
Remove third line in section headers This is truly important stuff. We've saved many lives with this update.
2018-09-07 19:36:16 -04:00
;; Packages
Rearrange core config, epa & authinfo bits (fix after! error)
2017-12-27 22:48:05 -05:00
:boom: private/default: add +bindings, +snippets & +evil-commands features #383 This is a breaking change. You'll need to add these three flags to your init.el to restore the defaults.
2018-01-30 21:24:18 -05:00
(def-package! emacs-snippets
:if (featurep! +snippets)
config/default: update emacs-snippets config Package now removes default snippets by itself, no need for us to do it too.
2018-05-08 01:00:49 +02:00
:after yasnippet)
Add private/default This will replace private/hlissner. Addresses #301
2017-12-23 02:27:42 -05:00
Rearrange core config, epa & authinfo bits (fix after! error)
2017-12-27 22:48:05 -05:00
;;
;; Config
Minor refactor, reformat & comment revision
2018-09-18 17:41:25 -04:00
;; Don't store authinfo in plain text!
Enforce encrypted authinfo & store in doom-etc-dir Plaintext authinfo should not be the default.
2018-06-01 17:10:30 +02:00
(defvar auth-sources
(list (expand-file-name "authinfo.gpg" doom-etc-dir)
"~/.authinfo.gpg"))
Rearrange core config, epa & authinfo bits (fix after! error)
2017-12-27 22:48:05 -05:00
(after! epa
(setq epa-file-encrypt-to (or epa-file-encrypt-to 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))
Introduce more opinionated backspace/del/newline behavior + Instead of remapping delete-backward-char to doom/delete-backward-char (which was unreliable, depending on the mode), it is now overridden with it, without sacrificing its original functionality. The new behavior is as follows: + Fall back to sp-backward-delete-char when it makes sense to delete the adjacent pair: {|} => | + Collapse an indented pair block, if at bolp in between: { | } => {|} + Refresh a pair's :post-handlers when deleting into pair: { | } => {|} => { | } (can be repeated) + When cursor is preceded by whitespace, delete in increments of tab-width. + newline-and-indent has been advised to: + Only newline when in a string. + Continue comment lines consistently (needs more testing!) + Falls back to basic newline-and-indent, without affecting whitespace in the origin line (it would originally delete-horizontal-space before creating a new line). + Incorporates a set of reasonable defaults for brace expansion on RET or SPC, as mentioned in #343 and #413. Affects #343, #413
2018-02-14 05:10:48 -05:00
;; 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))
Major refactor & optimization of how modules load their packages Now that we are loading package autoloads files (as part of the generated doom-package-autoload-file when running make autoloads), many :commands properties are redundant. In fact, many def-package! blocks are redundant. In some cases, we can do without a config.el file entirely, and can move into the autoloads file or rely entirely on package autoloads. Also, many settings have been moved in their module's autoloads files, which makes them available ASAP; their use no longer depends on module load order. This gained me a modest ~10% boost in startup speed.
2018-05-25 00:46:11 +02:00
;; Major-mode specific fixes
Apply smartparens {} fix to enh-ruby-mode too Fixes: {|} => { | } in enh-ruby-mode buffers too Reported by @ar1a
2018-07-06 15:28:55 +02:00
(sp-local-pair '(ruby-mode enh-ruby-mode) "{" "}"
Disable sp-ruby-*-handler handlers correctly Reported by @ar1a
2018-07-07 00:32:45 +02:00
:pre-handlers '(:rem sp-ruby-pre-handler)
:post-handlers '(:rem sp-ruby-post-handler))
Major refactor & optimization of how modules load their packages Now that we are loading package autoloads files (as part of the generated doom-package-autoload-file when running make autoloads), many :commands properties are redundant. In fact, many def-package! blocks are redundant. In some cases, we can do without a config.el file entirely, and can move into the autoloads file or rely entirely on package autoloads. Also, many settings have been moved in their module's autoloads files, which makes them available ASAP; their use no longer depends on module load order. This gained me a modest ~10% boost in startup speed.
2018-05-25 00:46:11 +02:00
Introduce more opinionated backspace/del/newline behavior + Instead of remapping delete-backward-char to doom/delete-backward-char (which was unreliable, depending on the mode), it is now overridden with it, without sacrificing its original functionality. The new behavior is as follows: + Fall back to sp-backward-delete-char when it makes sense to delete the adjacent pair: {|} => | + Collapse an indented pair block, if at bolp in between: { | } => {|} + Refresh a pair's :post-handlers when deleting into pair: { | } => {|} => { | } (can be repeated) + When cursor is preceded by whitespace, delete in increments of tab-width. + newline-and-indent has been advised to: + Only newline when in a string. + Continue comment lines consistently (needs more testing!) + Falls back to basic newline-and-indent, without affecting whitespace in the origin line (it would originally delete-horizontal-space before creating a new line). + Incorporates a set of reasonable defaults for brace expansion on RET or SPC, as mentioned in #343 and #413. Affects #343, #413
2018-02-14 05:10:48 -05:00
;; 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)))
;; 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")))
Refactor smartparens default rules Move them to config/default, but move single-lang-specific ones to their respective modules.
2018-06-25 15:54:38 +02:00
;; 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]" "*")))
Introduce more opinionated backspace/del/newline behavior + Instead of remapping delete-backward-char to doom/delete-backward-char (which was unreliable, depending on the mode), it is now overridden with it, without sacrificing its original functionality. The new behavior is as follows: + Fall back to sp-backward-delete-char when it makes sense to delete the adjacent pair: {|} => | + Collapse an indented pair block, if at bolp in between: { | } => {|} + Refresh a pair's :post-handlers when deleting into pair: { | } => {|} => { | } (can be repeated) + When cursor is preceded by whitespace, delete in increments of tab-width. + newline-and-indent has been advised to: + Only newline when in a string. + Continue comment lines consistently (needs more testing!) + Falls back to basic newline-and-indent, without affecting whitespace in the origin line (it would originally delete-horizontal-space before creating a new line). + Incorporates a set of reasonable defaults for brace expansion on RET or SPC, as mentioned in #343 and #413. Affects #343, #413
2018-02-14 05:10:48 -05:00
;; 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
Rename doom*newline-and-indent To doom*newline-indent-and-continue-comments; to better describe what it does.
2018-09-14 10:42:09 -04:00
(advice-add #'newline-and-indent :around #'doom*newline-indent-and-continue-comments))
Introduce more opinionated backspace/del/newline behavior + Instead of remapping delete-backward-char to doom/delete-backward-char (which was unreliable, depending on the mode), it is now overridden with it, without sacrificing its original functionality. The new behavior is as follows: + Fall back to sp-backward-delete-char when it makes sense to delete the adjacent pair: {|} => | + Collapse an indented pair block, if at bolp in between: { | } => {|} + Refresh a pair's :post-handlers when deleting into pair: { | } => {|} => { | } (can be repeated) + When cursor is preceded by whitespace, delete in increments of tab-width. + newline-and-indent has been advised to: + Only newline when in a string. + Continue comment lines consistently (needs more testing!) + Falls back to basic newline-and-indent, without affecting whitespace in the origin line (it would originally delete-horizontal-space before creating a new line). + Incorporates a set of reasonable defaults for brace expansion on RET or SPC, as mentioned in #343 and #413. Affects #343, #413
2018-02-14 05:10:48 -05:00
Add private/default This will replace private/hlissner. Addresses #301
2017-12-23 02:27:42 -05:00
(when (featurep 'evil)
:boom: private/default: add +bindings, +snippets & +evil-commands features #383 This is a breaking change. You'll need to add these three flags to your init.el to restore the defaults.
2018-01-30 21:24:18 -05:00
(when (featurep! +evil-commands)
:boom: Change first arg of load! macro load!'s first argument is no longer a symbol (that will cause void-variable errors now) to save on unnecessary interning and simplify compile-time logic. It accepts any valid form that evaluates to a string now. If you use load!, you need to change its argument to a string! e.g. (load! +my-module) => (load! "+my-module")
2018-05-27 12:44:22 +02:00
(load! "+evil-commands"))
private/default: refactor into multiple files + add evil checks
2017-12-30 00:56:54 -05:00
:boom: private/default: add +bindings, +snippets & +evil-commands features #383 This is a breaking change. You'll need to add these three flags to your init.el to restore the defaults.
2018-01-30 21:24:18 -05:00
(when (featurep! +bindings)
config/default: add +default-repeat-{forward,backward}-key options
2018-03-25 22:39:03 -04:00
(defvar +default-repeat-forward-key ";")
(defvar +default-repeat-backward-key ",")
Fix void macro errors after byte-compiling
2018-05-15 03:24:30 +02:00
(eval-when-compile
Appease byte-compiler-sama
2018-05-14 20:35:26 +02:00
(defmacro do-repeat! (command next-func prev-func)
Fix void macro errors after byte-compiling
2018-05-15 03:24:30 +02:00
"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'."
Appease byte-compiler-sama
2018-05-14 20:35:26 +02:00
(let ((fn-sym (intern (format "+evil*repeat-%s" (doom-unquote command)))))
`(progn
(defun ,fn-sym (&rest _)
Minor, general refactor
2018-06-07 02:49:32 +02:00
(define-key! evil-motion-state-map
+default-repeat-forward-key #',next-func
+default-repeat-backward-key #',prev-func))
Appease byte-compiler-sama
2018-05-14 20:35:26 +02:00
(advice-add #',command :before #',fn-sym)))))
private/default: refactor into multiple files + add evil checks
2017-12-30 00:56:54 -05:00
:boom: private/default: add +bindings, +snippets & +evil-commands features #383 This is a breaking change. You'll need to add these three flags to your init.el to restore the defaults.
2018-01-30 21:24:18 -05:00
;; n/N
(do-repeat! evil-ex-search-next evil-ex-search-next evil-ex-search-previous)
(do-repeat! evil-ex-search-previous evil-ex-search-next evil-ex-search-previous)
(do-repeat! evil-ex-search-forward evil-ex-search-next evil-ex-search-previous)
(do-repeat! evil-ex-search-backward evil-ex-search-next evil-ex-search-previous)
private/default: refactor into multiple files + add evil checks
2017-12-30 00:56:54 -05:00
:boom: private/default: add +bindings, +snippets & +evil-commands features #383 This is a breaking change. You'll need to add these three flags to your init.el to restore the defaults.
2018-01-30 21:24:18 -05:00
;; f/F/t/T/s/S
config/default: fix native evil-snipe repeat keys not being disabled
2018-03-20 15:56:52 -04:00
(setq evil-snipe-repeat-keys nil
evil-snipe-override-evil-repeat-keys nil) ; causes problems with remapped ;
config/default: remove unnecessary after! blocks
2018-05-14 20:42:48 +02:00
(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)
private/default: refactor into multiple files + add evil checks
2017-12-30 00:56:54 -05:00
:boom: private/default: add +bindings, +snippets & +evil-commands features #383 This is a breaking change. You'll need to add these three flags to your init.el to restore the defaults.
2018-01-30 21:24:18 -05:00
;; */#
config/default: remove unnecessary after! blocks
2018-05-14 20:42:48 +02:00
(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)))
Reference in a new issue Copy permalink