Load use-package extensions before usual layer loading
This commit is contained in:
parent
52deec4bb1
commit
b28d65b7aa
|
@ -82,6 +82,8 @@ the final step of executing code in `emacs-startup-hook'.")
|
||||||
;; explicitly set the preferred coding systems to avoid annoying prompt
|
;; explicitly set the preferred coding systems to avoid annoying prompt
|
||||||
;; from emacs (especially on Microsoft Windows)
|
;; from emacs (especially on Microsoft Windows)
|
||||||
(prefer-coding-system 'utf-8)
|
(prefer-coding-system 'utf-8)
|
||||||
|
;; Extend use package if already installed
|
||||||
|
(spacemacs/use-package-extend)
|
||||||
;; TODO move these variables when evil is removed from the bootstrapped
|
;; TODO move these variables when evil is removed from the bootstrapped
|
||||||
;; packages.
|
;; packages.
|
||||||
(setq-default evil-want-C-u-scroll t
|
(setq-default evil-want-C-u-scroll t
|
||||||
|
|
|
@ -19,12 +19,16 @@
|
||||||
;;
|
;;
|
||||||
;; You should have received a copy of the GNU General Public License
|
;; You should have received a copy of the GNU General Public License
|
||||||
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
(require 'core-fonts-support)
|
||||||
|
(require 'core-spacebind)
|
||||||
|
|
||||||
(defconst spacemacs--use-package-add-hook-keywords '(:pre-init
|
(defconst spacemacs--use-package-add-hook-keywords '(:pre-init
|
||||||
:post-init
|
:post-init
|
||||||
:pre-config
|
:pre-config
|
||||||
:post-config))
|
:post-config))
|
||||||
|
|
||||||
|
(defvar spacemacs--use-package-extended nil)
|
||||||
|
|
||||||
(defmacro spacemacs|use-package-add-hook (name &rest plist)
|
(defmacro spacemacs|use-package-add-hook (name &rest plist)
|
||||||
"Add post hooks to `:init' or `:config' arguments of an existing
|
"Add post hooks to `:init' or `:config' arguments of an existing
|
||||||
configuration.
|
configuration.
|
||||||
|
@ -59,4 +63,101 @@ override lazy-loaded settings."
|
||||||
(push `(add-hook ',hook (lambda nil ,@body t)) expanded-forms)))))
|
(push `(add-hook ',hook (lambda nil ,@body t)) expanded-forms)))))
|
||||||
`(progn ,@expanded-forms)))
|
`(progn ,@expanded-forms)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
(defun spacemacs/use-package-extend ()
|
||||||
|
"Extend use-package with custom keywords."
|
||||||
|
(when (and (require 'use-package nil t) (not spacemacs--use-package-extended))
|
||||||
|
(setq use-package-verbose init-file-debug
|
||||||
|
;; inject use-package hooks for easy customization of stock package
|
||||||
|
;; configuration
|
||||||
|
spacemacs--use-package-extended t
|
||||||
|
use-package-inject-hooks t)
|
||||||
|
(add-to-list 'use-package-keywords :spacebind t)
|
||||||
|
(add-to-list 'use-package-keywords :spacediminish t)))
|
||||||
|
|
||||||
|
(defun use-package-normalize/:spacebind (name-symbol keyword args)
|
||||||
|
(use-package-only-one (symbol-name keyword) args
|
||||||
|
(lambda (label arg)
|
||||||
|
(if (and (listp arg) (keywordp (car arg)))
|
||||||
|
arg
|
||||||
|
(use-package-error
|
||||||
|
":spacebind wants an arg list compatible with `spacebind' macro")))))
|
||||||
|
|
||||||
|
(defun use-package-handler/:spacebind (name-symbol keyword args rest state)
|
||||||
|
(let ((body (use-package-process-keywords name-symbol rest state)))
|
||||||
|
(if (null args)
|
||||||
|
body
|
||||||
|
(use-package-concat
|
||||||
|
body
|
||||||
|
`((spacemacs|spacebind ,@args))))))
|
||||||
|
|
||||||
|
(defun use-package-normalize/:spacediminish (name keyword args)
|
||||||
|
(use-package-as-one (symbol-name keyword) args
|
||||||
|
(apply-partially #'use-package-normalize-spacediminish name) t))
|
||||||
|
|
||||||
|
(defun use-package-handler/:spacediminish (name _keyword arg rest state)
|
||||||
|
(let ((body (use-package-process-keywords name rest state)))
|
||||||
|
(use-package-concat
|
||||||
|
`((when (fboundp 'spacemacs|diminish)
|
||||||
|
,@(if (consp (car arg)) ;; e.g. ((MODE FOO BAR) ...)
|
||||||
|
(mapcar (lambda (var) `(spacemacs|diminish ,@var))
|
||||||
|
arg)
|
||||||
|
`((spacemacs|diminish ,@arg))))) ;; e.g. (MODE FOO BAR)
|
||||||
|
body)))
|
||||||
|
|
||||||
|
(defun use-package-normalize-spacediminish (name label arg &optional recursed)
|
||||||
|
"Normalize the arguments to `spacemacs|diminish' to a list of one of six forms:
|
||||||
|
t
|
||||||
|
SYMBOL
|
||||||
|
STRING
|
||||||
|
(SYMBOL STRING)
|
||||||
|
(STRING STRING)
|
||||||
|
(SYMBOL STRING STRING)"
|
||||||
|
(let ((default-mode (use-package-as-mode name)))
|
||||||
|
(pcase arg
|
||||||
|
;; (PATTERN ..) when not recursive -> go to recursive case
|
||||||
|
((and (or `(,x . ,y) `(,x ,y))
|
||||||
|
(guard (and (not recursed)
|
||||||
|
(listp x)
|
||||||
|
(listp y))))
|
||||||
|
(mapcar (lambda (var) (use-package-normalize-spacediminish name label var t))
|
||||||
|
arg))
|
||||||
|
;; t -> (<PKG>-mode)
|
||||||
|
('t
|
||||||
|
(list default-mode))
|
||||||
|
;; SYMBOL -> (SYMBOL)
|
||||||
|
((pred use-package-non-nil-symbolp)
|
||||||
|
(list arg))
|
||||||
|
;; STRING -> (<PKG>-mode STRING)
|
||||||
|
((pred stringp)
|
||||||
|
(list default-mode arg))
|
||||||
|
;; (SYMBOL) when recursed -> (SYMBOL)
|
||||||
|
((and `(,x)
|
||||||
|
(guard (and recursed (use-package-non-nil-symbolp x))))
|
||||||
|
arg)
|
||||||
|
;; (STRING) when recursed -> (<PKG>-mode STRING))
|
||||||
|
((and `(,x)
|
||||||
|
(guard (and recursed (stringp x))))
|
||||||
|
(cons default-mode arg))
|
||||||
|
;; (SYMBOL STRING) -> (SYMBOL STRING)
|
||||||
|
((and `(,x ,y)
|
||||||
|
(guard (and (use-package-non-nil-symbolp x) (stringp y))))
|
||||||
|
arg)
|
||||||
|
;; (STRING STRING) -> (<PKG>-mode STRING STRING)
|
||||||
|
((and `(,x ,y)
|
||||||
|
(guard (and (stringp x) (stringp y))))
|
||||||
|
(cons default-mode arg))
|
||||||
|
;; (SYMBOL STRING STRING) -> (SYMBOL STRING STRING)
|
||||||
|
((and `(,x ,y ,z)
|
||||||
|
(guard (and (use-package-non-nil-symbolp x)
|
||||||
|
(stringp y)
|
||||||
|
(stringp z))))
|
||||||
|
arg)
|
||||||
|
(_
|
||||||
|
(use-package-error
|
||||||
|
(format
|
||||||
|
"%s wants a symbol, string, (symbol string), (string string), (symbol string string) or list of these: %S"
|
||||||
|
label arg))))))
|
||||||
|
|
||||||
(provide 'core-use-package-ext)
|
(provide 'core-use-package-ext)
|
||||||
|
|
1
init.el
1
init.el
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
;; Avoid garbage collection during startup.
|
;; Avoid garbage collection during startup.
|
||||||
;; see `SPC h . dotspacemacs-gc-cons' for more info
|
;; see `SPC h . dotspacemacs-gc-cons' for more info
|
||||||
(fmakunbound 'use-package)
|
|
||||||
(defconst emacs-start-time (current-time))
|
(defconst emacs-start-time (current-time))
|
||||||
(setq gc-cons-threshold 402653184 gc-cons-percentage 0.6)
|
(setq gc-cons-threshold 402653184 gc-cons-percentage 0.6)
|
||||||
(load (concat (file-name-directory load-file-name) "core/core-load-paths")
|
(load (concat (file-name-directory load-file-name) "core/core-load-paths")
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defun spacemacs/state-color-face (state)
|
(defun spacemacs/state-color-face (state)
|
||||||
|
@ -227,96 +226,6 @@ the scroll transient state.")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defun use-package-normalize/:spacebind (name-symbol keyword args)
|
|
||||||
(use-package-only-one (symbol-name keyword) args
|
|
||||||
(lambda (label arg)
|
|
||||||
(if (and (listp arg) (keywordp (car arg)))
|
|
||||||
arg
|
|
||||||
(use-package-error
|
|
||||||
":spacebind wants an arg list compatible with `spacebind' macro")))))
|
|
||||||
|
|
||||||
(defun use-package-handler/:spacebind (name-symbol keyword args rest state)
|
|
||||||
(let ((body (use-package-process-keywords name-symbol rest state)))
|
|
||||||
(if (null args)
|
|
||||||
body
|
|
||||||
(use-package-concat
|
|
||||||
body
|
|
||||||
`((spacemacs|spacebind ,@args))))))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defun use-package-normalize-spacediminish (name label arg &optional recursed)
|
|
||||||
"Normalize the arguments to `spacemacs|diminish' to a list of one of six forms:
|
|
||||||
t
|
|
||||||
SYMBOL
|
|
||||||
STRING
|
|
||||||
(SYMBOL STRING)
|
|
||||||
(STRING STRING)
|
|
||||||
(SYMBOL STRING STRING)"
|
|
||||||
(let ((default-mode (use-package-as-mode name)))
|
|
||||||
(pcase arg
|
|
||||||
;; (PATTERN ..) when not recursive -> go to recursive case
|
|
||||||
((and (or `(,x . ,y) `(,x ,y))
|
|
||||||
(guard (and (not recursed)
|
|
||||||
(listp x)
|
|
||||||
(listp y))))
|
|
||||||
(mapcar (lambda (var) (use-package-normalize-spacediminish name label var t))
|
|
||||||
arg))
|
|
||||||
;; t -> (<PKG>-mode)
|
|
||||||
('t
|
|
||||||
(list default-mode))
|
|
||||||
;; SYMBOL -> (SYMBOL)
|
|
||||||
((pred use-package-non-nil-symbolp)
|
|
||||||
(list arg))
|
|
||||||
;; STRING -> (<PKG>-mode STRING)
|
|
||||||
((pred stringp)
|
|
||||||
(list default-mode arg))
|
|
||||||
;; (SYMBOL) when recursed -> (SYMBOL)
|
|
||||||
((and `(,x)
|
|
||||||
(guard (and recursed (use-package-non-nil-symbolp x))))
|
|
||||||
arg)
|
|
||||||
;; (STRING) when recursed -> (<PKG>-mode STRING))
|
|
||||||
((and `(,x)
|
|
||||||
(guard (and recursed (stringp x))))
|
|
||||||
(cons default-mode arg))
|
|
||||||
;; (SYMBOL STRING) -> (SYMBOL STRING)
|
|
||||||
((and `(,x ,y)
|
|
||||||
(guard (and (use-package-non-nil-symbolp x) (stringp y))))
|
|
||||||
arg)
|
|
||||||
;; (STRING STRING) -> (<PKG>-mode STRING STRING)
|
|
||||||
((and `(,x ,y)
|
|
||||||
(guard (and (stringp x) (stringp y))))
|
|
||||||
(cons default-mode arg))
|
|
||||||
;; (SYMBOL STRING STRING) -> (SYMBOL STRING STRING)
|
|
||||||
((and `(,x ,y ,z)
|
|
||||||
(guard (and (use-package-non-nil-symbolp x)
|
|
||||||
(stringp y)
|
|
||||||
(stringp z))))
|
|
||||||
arg)
|
|
||||||
(_
|
|
||||||
(use-package-error
|
|
||||||
(format
|
|
||||||
"%s wants a symbol, string, (symbol string), (string string), (symbol string string) or list of these: %S"
|
|
||||||
label arg))))))
|
|
||||||
|
|
||||||
;;;###autoload
|
|
||||||
(defun use-package-normalize/:spacediminish (name keyword args)
|
|
||||||
(use-package-as-one (symbol-name keyword) args
|
|
||||||
(apply-partially #'use-package-normalize-spacediminish name) t))
|
|
||||||
|
|
||||||
;;;###autoload
|
|
||||||
(defun use-package-handler/:spacediminish (name _keyword arg rest state)
|
|
||||||
(let ((body (use-package-process-keywords name rest state)))
|
|
||||||
(use-package-concat
|
|
||||||
`((when (fboundp 'spacemacs|diminish)
|
|
||||||
,@(if (consp (car arg)) ;; e.g. ((MODE FOO BAR) ...)
|
|
||||||
(mapcar (lambda (var) `(spacemacs|diminish ,@var))
|
|
||||||
arg)
|
|
||||||
`((spacemacs|diminish ,@arg))))) ;; e.g. (MODE FOO BAR)
|
|
||||||
body)))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;; As suggested in the Emacs wiki https://www.emacswiki.org/emacs/HideShow#toc5
|
;; As suggested in the Emacs wiki https://www.emacswiki.org/emacs/HideShow#toc5
|
||||||
(defun spacemacs/toggle-selective-display (column)
|
(defun spacemacs/toggle-selective-display (column)
|
||||||
"Toggle selective display by column, a.k.a. folding by indentation.
|
"Toggle selective display by column, a.k.a. folding by indentation.
|
||||||
|
|
|
@ -335,13 +335,7 @@
|
||||||
hydra-head-format "[%s] "))
|
hydra-head-format "[%s] "))
|
||||||
|
|
||||||
(defun spacemacs-bootstrap/init-use-package ()
|
(defun spacemacs-bootstrap/init-use-package ()
|
||||||
(require 'use-package)
|
(spacemacs/use-package-extend))
|
||||||
(setq use-package-verbose init-file-debug
|
|
||||||
;; inject use-package hooks for easy customization of stock package
|
|
||||||
;; configuration
|
|
||||||
use-package-inject-hooks t)
|
|
||||||
(add-to-list 'use-package-keywords :spacebind t)
|
|
||||||
(add-to-list 'use-package-keywords :spacediminish t))
|
|
||||||
|
|
||||||
(defun spacemacs-bootstrap/init-which-key ()
|
(defun spacemacs-bootstrap/init-which-key ()
|
||||||
(require 'which-key)
|
(require 'which-key)
|
||||||
|
|
Loading…
Reference in New Issue