refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
;;; lisp/doom-profiles.el -*- lexical-binding: t; -*-
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;; Code:
|
|
|
|
|
(eval-when-compile (require 'doom)) ; be silent, o'byte-compiler
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;;; Variables
|
|
|
|
|
|
|
|
|
|
;;; File/directory variables
|
2022-09-17 22:02:50 +02:00
|
|
|
(defvar doom-profiles-generated-dir doom-data-dir
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
"Where generated profiles are kept.
|
|
|
|
|
|
|
|
|
|
Profile directories are in the format {data-profiles-dir}/$NAME/@/$VERSION, for
|
|
|
|
|
example: '~/.local/share/doom/_/@/0/'")
|
|
|
|
|
|
2022-09-17 22:02:50 +02:00
|
|
|
(defvar doom-profile-load-path
|
|
|
|
|
(if-let (path (getenv-internal "DOOMPROFILELOADPATH"))
|
|
|
|
|
(mapcar #'expand-file-name (split-string-and-unquote path path-separator))
|
|
|
|
|
(list (file-name-concat doom-user-dir "profiles.el")
|
|
|
|
|
(file-name-concat doom-emacs-dir "profiles.el")
|
|
|
|
|
(expand-file-name "doom-profiles.el" (or (getenv "XDG_CONFIG_HOME") "~/.config"))
|
|
|
|
|
(expand-file-name "~/.doom-profiles.el")
|
|
|
|
|
(file-name-concat doom-user-dir "profiles")
|
|
|
|
|
(file-name-concat doom-emacs-dir "profiles")))
|
|
|
|
|
"A list of profile config files or directories that house implicit profiles.
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
2022-09-17 22:02:50 +02:00
|
|
|
`doom-profiles-initialize' loads and merges all profiles defined in the above
|
|
|
|
|
files/directories, then writes a profile load script to
|
|
|
|
|
`doom-profile-load-file'.
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
2022-09-17 22:02:50 +02:00
|
|
|
Can be changed externally by setting $DOOMPROFILELOADPATH to a colon-delimited
|
|
|
|
|
list of paths or profile config files (semi-colon delimited on Windows).")
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
2022-09-17 22:02:50 +02:00
|
|
|
(defvar doom-profile-load-file
|
|
|
|
|
(if-let (loader (getenv-internal "DOOMPROFILELOADFILE"))
|
|
|
|
|
(expand-file-name loader doom-emacs-dir)
|
|
|
|
|
(file-name-concat doom-emacs-dir (format "profiles/load.el" emacs-major-version)))
|
|
|
|
|
"Where Doom writes its interactive profile loader script.
|
|
|
|
|
|
|
|
|
|
Can be changed externally by setting $DOOMPROFILELOADFILE.")
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
|
|
|
|
(defvar doom-profile-init-file-name (format "init.%d.el" emacs-major-version)
|
|
|
|
|
"TODO")
|
|
|
|
|
|
|
|
|
|
(defvar doom-profile-init-dir-name (format "init.%d.d" emacs-major-version)
|
|
|
|
|
"The subdirectory of `doom-profile-dir'")
|
|
|
|
|
|
|
|
|
|
(defvar doom-profiles-config-file-name ".doomprofile"
|
|
|
|
|
"TODO")
|
|
|
|
|
|
|
|
|
|
;;; Profile storage variables
|
|
|
|
|
(defvar doom-profile-generators
|
|
|
|
|
'(("05-init-vars.auto.el" . doom-profile--generate-init-vars)
|
|
|
|
|
("80-loaddefs.auto.el" . doom-profile--generate-doom-autoloads)
|
|
|
|
|
("90-loaddefs-packages.auto.el" . doom-profile--generate-package-autoloads)
|
|
|
|
|
("95-load-modules.auto.el" . doom-profile--generate-load-modules))
|
|
|
|
|
"An alist mapping file names to generator functions.
|
|
|
|
|
|
|
|
|
|
The file will be generated in `doom-profile-dir'/`doom-profile-init-dir-name',
|
|
|
|
|
and later combined into `doom-profile-dir'/`doom-profile-init-file-name' in
|
|
|
|
|
lexicographical order. These partials are left behind in case the use wants to
|
|
|
|
|
load them directly (for whatever use), or for commands to use (e.g.
|
|
|
|
|
`doom/reload-autoloads' loads any file with a NN-loaddefs[-.] prefix to
|
|
|
|
|
accomplish its namesake).
|
|
|
|
|
|
|
|
|
|
Files with an .auto.el suffix will be automatically deleted whenever the profile
|
|
|
|
|
is regenerated. Users (or Doom CLIs, like `doom env') may add their own
|
|
|
|
|
generators to this list, or to `doom-profile-dir'/`doom-profile-init-dir-name',
|
|
|
|
|
and they will be included in the profile init file next time `doom sync' is
|
|
|
|
|
run.")
|
|
|
|
|
|
|
|
|
|
(defvar doom--profiles ())
|
|
|
|
|
|
2022-09-17 20:58:27 +02:00
|
|
|
(defconst doom-profile-default (cons "_" "0"))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;;; Helpers
|
|
|
|
|
|
2022-09-17 14:50:23 +02:00
|
|
|
(defun doom-profiles-bootloadable-p ()
|
|
|
|
|
"Return non-nil if `doom-emacs-dir' can be a bootloader."
|
|
|
|
|
(with-memoization (get 'doom 'bootloader)
|
|
|
|
|
(or (file-equal-p doom-emacs-dir "~/.config/emacs")
|
|
|
|
|
(file-equal-p doom-emacs-dir "~/.emacs.d"))))
|
|
|
|
|
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
(defun doom-profiles-read (&rest paths)
|
|
|
|
|
"TODO"
|
|
|
|
|
(let (profiles)
|
2022-09-17 20:58:27 +02:00
|
|
|
(dolist (path (delq nil (flatten-list paths)))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
(cond
|
|
|
|
|
((file-directory-p path)
|
2022-09-17 13:01:28 +02:00
|
|
|
(setq path (file-truename path))
|
|
|
|
|
(dolist (subdir (doom-files-in path :depth 0 :match "/[^.][^/]+$" :type 'dirs :map #'file-name-base))
|
2022-09-17 20:58:27 +02:00
|
|
|
(if (equal subdir (car doom-profile-default))
|
|
|
|
|
(signal 'doom-profile-error (list (file-name-concat path subdir) "Implicit profile has invalid name"))
|
|
|
|
|
(unless (string-prefix-p "_" subdir)
|
|
|
|
|
(cl-pushnew
|
|
|
|
|
(cons (intern subdir)
|
|
|
|
|
(let* ((val (abbreviate-file-name (file-name-as-directory subdir)))
|
|
|
|
|
(val (if (file-name-absolute-p val)
|
|
|
|
|
`(,val)
|
|
|
|
|
`(,(abbreviate-file-name path) ,val))))
|
|
|
|
|
(cons `(user-emacs-directory :path ,@val)
|
|
|
|
|
(if-let (profile-file (file-exists-p! doom-profiles-config-file-name path))
|
|
|
|
|
(car (doom-file-read profile-file :by 'read*))
|
|
|
|
|
(when (file-exists-p (doom-path path subdir "lisp/doom.el"))
|
|
|
|
|
'((doom-user-dir :path ,@val)))))))
|
|
|
|
|
profiles
|
|
|
|
|
:test #'eq
|
|
|
|
|
:key #'car)))))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
((file-exists-p path)
|
|
|
|
|
(dolist (profile (car (doom-file-read path :by 'read*)))
|
2022-09-17 20:58:27 +02:00
|
|
|
(if (eq (symbol-name (car profile)) (car doom-profile-default))
|
|
|
|
|
(signal 'doom-profile-error (list path "Profile has invalid name: _"))
|
|
|
|
|
(unless (string-prefix-p "_" (symbol-name (car profile)))
|
|
|
|
|
(cl-pushnew profile profiles
|
|
|
|
|
:test #'eq
|
|
|
|
|
:key #'car)))))))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
(nreverse profiles)))
|
|
|
|
|
|
2022-09-17 22:02:50 +02:00
|
|
|
(defun doom-profiles-autodetect (&optional _internal?)
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
"Return all known profiles as a nested alist.
|
|
|
|
|
|
2022-09-17 22:02:50 +02:00
|
|
|
This reads all profile configs and directories in `doom-profile-load-path', then
|
|
|
|
|
caches them in `doom--profiles'. If RELOAD? is non-nil, refresh the cache."
|
|
|
|
|
(doom-profiles-read doom-profile-load-path
|
|
|
|
|
;; TODO: Add in v3
|
|
|
|
|
;; (if internal? doom-profiles-generated-dir)
|
|
|
|
|
))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
|
|
|
|
(defun doom-profiles-outdated-p ()
|
2022-09-17 22:02:50 +02:00
|
|
|
"Return non-nil if files in `doom-profile-load-file' are outdated."
|
|
|
|
|
(cl-loop for path in doom-profile-load-path
|
|
|
|
|
when (string-suffix-p path ".el")
|
|
|
|
|
if (or (not (file-exists-p doom-profile-load-file))
|
|
|
|
|
(file-newer-than-file-p path doom-profile-load-file)
|
|
|
|
|
(not (equal (doom-file-read doom-profile-load-file :by 'read)
|
2022-09-17 15:29:22 +02:00
|
|
|
doom-version)))
|
|
|
|
|
return t))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
|
|
|
|
(defun doom-profile<-id (id)
|
|
|
|
|
"Return a (NAME . VERSION) profile cons cell from an id string NAME@VERSION."
|
|
|
|
|
(save-match-data
|
|
|
|
|
(if (string-match "^\\([^@]+\\)@\\(.+\\)$" id)
|
|
|
|
|
(cons (match-string 1 id)
|
|
|
|
|
(match-string 2 id))
|
|
|
|
|
(cons id (cdr doom-profile-default)))))
|
|
|
|
|
|
|
|
|
|
(defun doom-profile->id (profile)
|
|
|
|
|
"Return a NAME@VERSION id string from profile cons cell (NAME . VERSION)."
|
|
|
|
|
(cl-check-type profile cons)
|
|
|
|
|
(format "%s@%s" (car profile) (cdr profile)))
|
|
|
|
|
|
|
|
|
|
;; TODO (defun doom-profile--read (profile)
|
|
|
|
|
;; (doom-profile-create ))
|
|
|
|
|
|
|
|
|
|
;; TODO (defun doom-profile-initialize (profile-name &optional ref)
|
|
|
|
|
;; )
|
|
|
|
|
|
2022-09-17 20:21:43 +02:00
|
|
|
(defun doom-profiles-save (profiles &optional file)
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
"Generate a profile bootstrapper for Doom to load at startup."
|
2022-09-17 20:21:43 +02:00
|
|
|
(unless file
|
2022-09-17 22:02:50 +02:00
|
|
|
(setq file doom-profile-load-file))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
(doom-file-write
|
2022-09-17 20:21:43 +02:00
|
|
|
file (let ((profilesym (make-symbol "profile"))
|
|
|
|
|
(deferredsym (make-symbol "deferred-vars")))
|
|
|
|
|
`(";; -*- lexical-binding: t; tab-width: 8; -*-\n"
|
|
|
|
|
";; Updated: " ,(format-time-string "%Y-%m-%d %H:%M:%S") "\n"
|
|
|
|
|
";; Generated by 'doom profiles sync' or 'doom sync'.\n"
|
|
|
|
|
";; DO NOT EDIT THIS BY HAND!\n"
|
|
|
|
|
,(format "%S" doom-version)
|
|
|
|
|
(pcase (intern (getenv-internal "DOOMPROFILE"))
|
|
|
|
|
,@(cl-loop
|
|
|
|
|
for (profile-name . bindings) in profiles
|
|
|
|
|
for deferred?
|
|
|
|
|
= (seq-find (fn! (and (memq (car-safe (cdr %)) '(:prepend :prepend? :append :append?))
|
|
|
|
|
(not (stringp (car-safe %)))))
|
|
|
|
|
bindings)
|
|
|
|
|
collect
|
|
|
|
|
`(',profile-name
|
|
|
|
|
(let ,(if deferred? '(--deferred-vars--))
|
|
|
|
|
,@(cl-loop
|
|
|
|
|
for (var . val) in bindings
|
|
|
|
|
collect
|
|
|
|
|
(pcase (car-safe val)
|
|
|
|
|
(:path
|
|
|
|
|
`(,(if (stringp var) 'setenv 'setq)
|
|
|
|
|
,var ,(cl-loop with form = `(expand-file-name ,(cadr val) user-emacs-directory)
|
|
|
|
|
for dir in (cddr val)
|
|
|
|
|
do (setq form `(expand-file-name ,dir ,form))
|
|
|
|
|
finally return form)))
|
|
|
|
|
(:eval
|
|
|
|
|
(if (eq var '_)
|
|
|
|
|
(macroexp-progn (cdr val))
|
|
|
|
|
`(,(if (stringp var) 'setenv 'setq)
|
|
|
|
|
,var ,(macroexp-progn (cdr val)))))
|
|
|
|
|
(:plist
|
|
|
|
|
`(,(if (stringp var) 'setenv 'setq)
|
|
|
|
|
,var ',(if (stringp var)
|
|
|
|
|
(prin1-to-string (cadr val))
|
|
|
|
|
(cadr val))))
|
|
|
|
|
((or :prepend :prepend?)
|
|
|
|
|
(if (stringp var)
|
|
|
|
|
`(setenv ,var (concat ,val (getenv ,var)))
|
|
|
|
|
(setq deferred? t)
|
|
|
|
|
`(push (cons ',var
|
|
|
|
|
(lambda ()
|
|
|
|
|
(dolist (item (list ,@(cdr val)))
|
|
|
|
|
,(if (eq (car val) :append?)
|
|
|
|
|
`(add-to-list ',var item)
|
|
|
|
|
`(push item ,var)))))
|
|
|
|
|
--deferred-vars--)))
|
|
|
|
|
((or :append :append?)
|
|
|
|
|
(if (stringp var)
|
|
|
|
|
`(setenv ,var (concat (getenv ,var) ,val))
|
|
|
|
|
(setq deferred? t)
|
|
|
|
|
`(push (cons ',var
|
|
|
|
|
(lambda ()
|
|
|
|
|
(dolist (item (list ,@(cdr val)))
|
|
|
|
|
,(if (eq (car val) :append?)
|
|
|
|
|
`(add-to-list ',var item 'append)
|
|
|
|
|
`(set ',var (append ,var (list item)))))))
|
|
|
|
|
--deferred-vars--)))
|
|
|
|
|
(_ `(,(if (stringp var) 'setenv 'setq) ,var ',val))))
|
|
|
|
|
,@(when deferred?
|
|
|
|
|
`((defun --doom-profile-set-deferred-vars-- (_)
|
|
|
|
|
(dolist (var --deferred-vars--)
|
|
|
|
|
(when (boundp (car var))
|
|
|
|
|
(funcall (cdr var))
|
|
|
|
|
(setq --deferred-vars-- (delete var --deferred-vars--))))
|
|
|
|
|
(unless --deferred-vars--
|
|
|
|
|
(remove-hook 'after-load-functions #'--doom-profile-set-deferred-vars--)
|
|
|
|
|
(unintern '--doom-profile-set-deferred-vars-- obarray)))
|
|
|
|
|
(add-hook 'after-load-functions #'--doom-profile-set-deferred-vars--)
|
|
|
|
|
(--doom-profile-set-deferred-vars-- nil)))))))))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
:mode #o600
|
|
|
|
|
:printfn #'pp)
|
2022-09-17 20:21:43 +02:00
|
|
|
(print-group!
|
|
|
|
|
(or (let ((byte-compile-warnings (if init-file-debug byte-compile-warnings))
|
|
|
|
|
(byte-compile-dest-file-function
|
|
|
|
|
(lambda (_) (format "%s.%d.elc" (file-name-sans-extension file) emacs-major-version))))
|
|
|
|
|
(byte-compile-file file))
|
|
|
|
|
;; Do it again? So the errors/warnings are visible?
|
|
|
|
|
;; (let ((byte-compile-warnings t))
|
|
|
|
|
;; (byte-compile-file file))
|
|
|
|
|
(signal 'doom-profile-error (list file "Failed to byte-compile bootstrap file")))))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
|
|
|
|
(defun doom-profile-p (profile-name)
|
|
|
|
|
"Return t if PROFILE-NAME is a valid and existing profile."
|
|
|
|
|
(when (stringp profile-name)
|
|
|
|
|
(setq profile-name (intern profile-name)))
|
|
|
|
|
(and (assq profile-name (doom-profiles))
|
|
|
|
|
t))
|
|
|
|
|
|
|
|
|
|
(defun doom-profile-get (profile-name &optional property null-value)
|
|
|
|
|
"Return PROFILE-NAME's PROFILE, otherwise its PROPERTY, otherwise NULL-VALUE."
|
|
|
|
|
(when (stringp profile-name)
|
|
|
|
|
(setq profile-name (intern profile-name)))
|
|
|
|
|
(if-let (profile (assq profile-name (doom-profiles)))
|
|
|
|
|
(if property
|
|
|
|
|
(if-let (propval (assq property (cdr profile)))
|
|
|
|
|
(cdr propval)
|
|
|
|
|
null-value)
|
|
|
|
|
profile)
|
|
|
|
|
null-value))
|
|
|
|
|
|
|
|
|
|
(defun doom-profile-emacs-dir (profile-name)
|
|
|
|
|
"Return the `user-emacs-directory' for PROFILE-NAME.
|
|
|
|
|
|
|
|
|
|
If the profile doesn't specify one, fall back to `doom-emacs-dir'."
|
|
|
|
|
(doom-profile-get profile-name 'user-emacs-directory doom-emacs-dir))
|
|
|
|
|
|
|
|
|
|
(defun doom-profile-init-file (&optional profile-id version)
|
|
|
|
|
"Return the init file for PROFILE-ID at VERSION.
|
|
|
|
|
|
|
|
|
|
Defaults to the profile at `doom-profile-default'."
|
|
|
|
|
(cl-destructuring-bind (profile . version)
|
|
|
|
|
(if (and (stringp profile-id) (null version))
|
|
|
|
|
(doom-profile<-id profile-id)
|
|
|
|
|
(cl-check-type profile-id (or null string))
|
|
|
|
|
(cl-check-type version (or null string))
|
2022-09-17 20:58:27 +02:00
|
|
|
(cons (or profile-id ;; (car doom-profile-default)
|
|
|
|
|
)
|
|
|
|
|
(or version ;; (cdr doom-profile-default)
|
|
|
|
|
)))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
(file-name-concat doom-data-dir
|
|
|
|
|
profile "@" version
|
|
|
|
|
(format doom-profile-init-file-name emacs-major-version))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;;; Data structures
|
|
|
|
|
|
|
|
|
|
;; TODO
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;;; API
|
|
|
|
|
|
|
|
|
|
;; TODO (defun doom-profile-create (name))
|
|
|
|
|
|
|
|
|
|
;; TODO (defun doom-profile-hash (profile))
|
|
|
|
|
|
|
|
|
|
;; TODO (defmacro with-profile! (profile &rest body))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
;;; Generators
|
|
|
|
|
|
|
|
|
|
(defun doom-profile-generate (&optional _profile regenerate-only?)
|
|
|
|
|
"Generate profile init files."
|
|
|
|
|
(doom-initialize-packages)
|
|
|
|
|
(let* ((default-directory doom-profile-dir)
|
|
|
|
|
(init-dir doom-profile-init-dir-name)
|
|
|
|
|
(init-file doom-profile-init-file-name))
|
|
|
|
|
(print! (start "(Re)building profile in %s/...") (dirname doom-profile-dir))
|
|
|
|
|
(condition-case-unless-debug e
|
|
|
|
|
(with-file-modes #o750
|
|
|
|
|
(print-group!
|
|
|
|
|
(make-directory init-dir t)
|
|
|
|
|
(print! (start "Deleting old init files..."))
|
|
|
|
|
(print-group! :level 'info
|
|
|
|
|
(cl-loop for file in (cons init-file (doom-glob "*.elc"))
|
|
|
|
|
if (file-exists-p file)
|
|
|
|
|
do (print! (item "Deleting %s...") file)
|
|
|
|
|
and do (delete-file file)))
|
|
|
|
|
(let ((auto-files (doom-glob init-dir "*.auto.el")))
|
|
|
|
|
(print! (start "Generating %d init files...") (length doom-profile-generators))
|
|
|
|
|
(print-group! :level 'info
|
|
|
|
|
(dolist (file auto-files)
|
|
|
|
|
(print! (item "Deleting %s...") file)
|
|
|
|
|
(delete-file file))
|
|
|
|
|
(pcase-dolist (`(,file . ,fn) doom-profile-generators)
|
|
|
|
|
(let ((file (doom-path init-dir file)))
|
|
|
|
|
(doom-log "Building %s..." file)
|
|
|
|
|
(doom-file-write file (funcall fn))))))
|
|
|
|
|
(with-file! init-file
|
|
|
|
|
(insert ";; -*- coding: utf-8; lexical-binding: t; -*-\n"
|
|
|
|
|
";; This file was autogenerated; do not edit it by hand!\n")
|
|
|
|
|
;; Doom needs to be synced/rebuilt if either Doom or Emacs has been
|
|
|
|
|
;; up/downgraded. This is because byte-code isn't backwards
|
|
|
|
|
;; compatible, and many packages (including Doom), make in absolute
|
|
|
|
|
;; paths into their caches that need to be refreshed.
|
|
|
|
|
(prin1 `(unless (equal doom-version ,doom-version)
|
|
|
|
|
(error ,(concat
|
|
|
|
|
"The installed version of Doom (%s) has changed (to %s) since last "
|
|
|
|
|
"'doom sync'. Run 'doom sync' to bring Doom up to speed")
|
|
|
|
|
,doom-version doom-version))
|
|
|
|
|
(current-buffer))
|
|
|
|
|
(dolist (file (doom-glob init-dir "*.el"))
|
|
|
|
|
(print-group! :level 'info
|
|
|
|
|
(print! (start "Reading %s...") file))
|
|
|
|
|
(doom-file-read file :by 'insert)))
|
|
|
|
|
(print! (start "Byte-compiling %s...") (relpath init-file))
|
|
|
|
|
(print-group!
|
|
|
|
|
(let ((byte-compile-warnings (if init-file-debug '(suspicious make-local callargs))))
|
|
|
|
|
(byte-compile-file init-file)))
|
|
|
|
|
(print! (success "Built %s") (byte-compile-dest-file init-file))))
|
|
|
|
|
(error (delete-file init-file)
|
|
|
|
|
(delete-file (byte-compile-dest-file init-file))
|
|
|
|
|
(signal 'doom-autoload-error (list init-file e))))))
|
|
|
|
|
|
|
|
|
|
(defun doom-profile--generate-init-vars ()
|
|
|
|
|
(let ((v (version-to-list doom-version))
|
|
|
|
|
(ref (doom-call-process "git" "-C" (doom-path doom-emacs-dir) "rev-parse" "HEAD"))
|
|
|
|
|
(branch (doom-call-process "git" "-C" (doom-path doom-emacs-dir) "branch" "--show-current")))
|
refactor: introduce doom-context
Introduces a system to announce what execution contexts are active, so I
can react appropriately, emit more helpful logs/warnings in the case of
issues, and throw more meaningful errors.
* bin/doom: load module CLIs in the 'modules' context.
* lisp/cli/doctor.el: load package files in 'packages' context.
* lisp/doom-cli.el:
- (doom-before-init-hook, doom-after-init-hook): trigger hooks at the
correct time. This may increase startup load time, as the benchmark
now times more of the startup process.
- (doom-cli-execute, doom-cli-context-execute,
doom-cli-context-restore, doom-cli-context-parse,
doom-cli--output-benchmark-h, doom-cli-call, doom-cli--restart,
doom-cli-load, run!): remove redundant context prefix in debug logs,
it's now redundant with doom-context, which doom-log now prefixes
them with.
* lisp/doom-lib.el (doom-log): prefix doom-context to doom-log output,
unless it starts with :.
* lisp/doom-packages.el (package!, doom-packages--read): throw error if
not used in a packages.el file or in the context of our package
manager.
* lisp/doom-profiles.el (doom-profile--generate-init-vars,
doom-profile--generate-load-modules): use modules doom-context instead
of doom-init-time to detect startup.
* lisp/doom-start.el (doom-load-packages-incrementally-h): move function
closer to end of doom-after-init-hook.
* lisp/doom.el:
- (doom-before-init-hook, doom--set-initial-values-h,
doom--begin-init-h): rename doom--set-initial-values-h to
doom--begin-init-h and ensure it runs as late in
doom-before-init-hook as possible, as that is the point where Doom's
"initialization" formally begins.
- (doom-after-init-hook): don't trigger at the end of command-line-1
in non-interactive sessions. This will be triggered manually in
doom-cli.el's run!.
* lisp/lib/config.el (doom/reload, doom/reload-autoloads,
doom/reload-env): use 'reload' context for reload commands.
* modules/lang/emacs-lisp/autoload.el (+emacs-lisp-eval): use 'eval'
context.
* modules/lang/org/config.el: remove doom-reloading-p; check for
'reload' doom context instead.
2022-09-24 12:38:25 +02:00
|
|
|
;; FIX: Make sure this only runs at startup to protect us Emacs' interpreter
|
|
|
|
|
;; re-evaluating this file when lazy-loading dynamic docstrings from the
|
|
|
|
|
;; byte-compiled init file.
|
|
|
|
|
`((when (doom-context-p 'init)
|
fix: freezing+side-effects on `M-x` or `C-h {f,v}`
To understand this issue, you have to understand these two things:
1. Doom builds an init file which combines all its autoloads (for
packages and modules), and Doom's bootstrapper (which loads modules,
$DOOMDIR, etc). This init file is byte-compiled.
2. When Emacs byte-compiles elisp, docstrings are lazy-loaded (by
embedding them in the elc as commented text to be retrieved later).
This is generally done to save on memory.
Now the issue: when these lazy-loaded docstrings are retrieved, Emacs
may evaluate the whole file to find it, including Doom's bootstrap
process, reloading all its files, the user's config files, and running
all its startup hooks. Not only is this terribly expensive, reloading
these files may have disastrous effects.
One such effect is compounded by Marginalia, which invokes this
docstring fetch process (by calling the `documentation` function in
`marginalia--function-doc`) for *each* symbol in the `M-x` or `C-h
{v,f}` completion lists, which means Doom re-bootstraps multiple times
and rapidly, causing Emacs to totally lock up.
The solution is to simply gate the expensive part of the initfile so it
doesn't run more than once, at startup, and when `doom/reload` is
called. The rest of the file loads instantly.
Still, this is a bit flimsy. I'll think of a more elegant solution
later.
2022-09-20 01:09:37 +02:00
|
|
|
,@(cl-loop for var in doom-autoloads-cached-vars
|
|
|
|
|
if (boundp var)
|
|
|
|
|
collect `(set-default ',var ',(symbol-value var)))
|
|
|
|
|
(setplist 'doom-version
|
|
|
|
|
'(major ,(nth 0 v)
|
|
|
|
|
minor ,(nth 1 v)
|
|
|
|
|
build ,(nth 2 v)
|
2022-09-23 18:14:06 +02:00
|
|
|
tag ,(ignore-errors (cadr (split-string doom-version "-" t)))
|
fix: freezing+side-effects on `M-x` or `C-h {f,v}`
To understand this issue, you have to understand these two things:
1. Doom builds an init file which combines all its autoloads (for
packages and modules), and Doom's bootstrapper (which loads modules,
$DOOMDIR, etc). This init file is byte-compiled.
2. When Emacs byte-compiles elisp, docstrings are lazy-loaded (by
embedding them in the elc as commented text to be retrieved later).
This is generally done to save on memory.
Now the issue: when these lazy-loaded docstrings are retrieved, Emacs
may evaluate the whole file to find it, including Doom's bootstrap
process, reloading all its files, the user's config files, and running
all its startup hooks. Not only is this terribly expensive, reloading
these files may have disastrous effects.
One such effect is compounded by Marginalia, which invokes this
docstring fetch process (by calling the `documentation` function in
`marginalia--function-doc`) for *each* symbol in the `M-x` or `C-h
{v,f}` completion lists, which means Doom re-bootstraps multiple times
and rapidly, causing Emacs to totally lock up.
The solution is to simply gate the expensive part of the initfile so it
doesn't run more than once, at startup, and when `doom/reload` is
called. The rest of the file loads instantly.
Still, this is a bit flimsy. I'll think of a more elegant solution
later.
2022-09-20 01:09:37 +02:00
|
|
|
ref ,(if (zerop (car ref)) (cdr ref))
|
|
|
|
|
branch ,(if (zerop (car branch)) (cdr branch))))))))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
|
|
|
|
(defun doom-profile--generate-load-modules ()
|
fix: add :depth field to modules
This introduces a depth field for modules so that they may dictate their
load order explicitly, it also treats depths <= -100 or >= 100 as
special depths, which will be loaded early, before their respective
doom-{before,after}-module-{init,config}-hook. This permits psuedo
modules like :core and :user modules to be treated as normal modules
without too many special cases.
This also fixes a module load order issue on Emacs 29 (#6813), caused by
emacs-mirror/emacs@4311bd0bd73c, which changed the return value order of
hash-table-{keys,values} causing modules to be loaded in reverse order;
resulting in the loss of evil keybinds, among other things.
Other notable changes:
- Changes the data structure for module data caches from a list to a
vector. Uses less memory and permits faster lookups. Also adds two
depth fields to the front of it.
- Changes the signature of doom-module-list and doom-package-list.
- Renames doom--read-packages -> doom-packages--read for consistency
with naming convention.
- Add doom-module-depth function.
- Adds a temporary doom-core-dir/init.el file, which is responsible for
loading doom-*.el.
Fix: #6813
Ref: emacs-mirror/emacs@4311bd0bd73c
2022-09-23 18:55:20 +02:00
|
|
|
(let* ((init-modules-list (doom-module-list nil t))
|
|
|
|
|
(config-modules-list (doom-module-list))
|
|
|
|
|
(pre-init-modules
|
|
|
|
|
(seq-filter (fn! (<= (doom-module-depth (car %) (cdr %) t) -100))
|
|
|
|
|
(remove '(:user) init-modules-list)))
|
|
|
|
|
(init-modules
|
|
|
|
|
(seq-filter (fn! (<= 0 (doom-module-depth (car %) (cdr %) t) 100))
|
|
|
|
|
init-modules-list))
|
|
|
|
|
(config-modules
|
|
|
|
|
(seq-filter (fn! (<= 0 (doom-module-depth (car %) (cdr %)) 100))
|
|
|
|
|
config-modules-list))
|
|
|
|
|
(post-config-modules
|
|
|
|
|
(seq-filter (fn! (>= (doom-module-depth (car %) (cdr %)) 100))
|
|
|
|
|
config-modules-list))
|
2022-09-24 10:45:50 +02:00
|
|
|
(init-file doom-module-init-file)
|
|
|
|
|
(config-file doom-module-config-file))
|
fix: add :depth field to modules
This introduces a depth field for modules so that they may dictate their
load order explicitly, it also treats depths <= -100 or >= 100 as
special depths, which will be loaded early, before their respective
doom-{before,after}-module-{init,config}-hook. This permits psuedo
modules like :core and :user modules to be treated as normal modules
without too many special cases.
This also fixes a module load order issue on Emacs 29 (#6813), caused by
emacs-mirror/emacs@4311bd0bd73c, which changed the return value order of
hash-table-{keys,values} causing modules to be loaded in reverse order;
resulting in the loss of evil keybinds, among other things.
Other notable changes:
- Changes the data structure for module data caches from a list to a
vector. Uses less memory and permits faster lookups. Also adds two
depth fields to the front of it.
- Changes the signature of doom-module-list and doom-package-list.
- Renames doom--read-packages -> doom-packages--read for consistency
with naming convention.
- Add doom-module-depth function.
- Adds a temporary doom-core-dir/init.el file, which is responsible for
loading doom-*.el.
Fix: #6813
Ref: emacs-mirror/emacs@4311bd0bd73c
2022-09-23 18:55:20 +02:00
|
|
|
(letf! ((defun module-loader (group name file &optional noerror)
|
|
|
|
|
`(let ((doom--current-module '(,group . ,name))
|
|
|
|
|
(doom--current-flags ',(doom-module-get group name :flags)))
|
2022-09-24 10:45:50 +02:00
|
|
|
(doom-load ,(abbreviate-file-name (file-name-sans-extension file)))))
|
fix: add :depth field to modules
This introduces a depth field for modules so that they may dictate their
load order explicitly, it also treats depths <= -100 or >= 100 as
special depths, which will be loaded early, before their respective
doom-{before,after}-module-{init,config}-hook. This permits psuedo
modules like :core and :user modules to be treated as normal modules
without too many special cases.
This also fixes a module load order issue on Emacs 29 (#6813), caused by
emacs-mirror/emacs@4311bd0bd73c, which changed the return value order of
hash-table-{keys,values} causing modules to be loaded in reverse order;
resulting in the loss of evil keybinds, among other things.
Other notable changes:
- Changes the data structure for module data caches from a list to a
vector. Uses less memory and permits faster lookups. Also adds two
depth fields to the front of it.
- Changes the signature of doom-module-list and doom-package-list.
- Renames doom--read-packages -> doom-packages--read for consistency
with naming convention.
- Add doom-module-depth function.
- Adds a temporary doom-core-dir/init.el file, which is responsible for
loading doom-*.el.
Fix: #6813
Ref: emacs-mirror/emacs@4311bd0bd73c
2022-09-23 18:55:20 +02:00
|
|
|
(defun module-list-loader (modules file &optional noerror)
|
|
|
|
|
(cl-loop for (cat . mod) in modules
|
|
|
|
|
if (doom-module-locate-path cat mod file)
|
|
|
|
|
collect (module-loader cat mod it noerror))))
|
|
|
|
|
;; FIX: Same as above (see `doom-profile--generate-init-vars').
|
refactor: introduce doom-context
Introduces a system to announce what execution contexts are active, so I
can react appropriately, emit more helpful logs/warnings in the case of
issues, and throw more meaningful errors.
* bin/doom: load module CLIs in the 'modules' context.
* lisp/cli/doctor.el: load package files in 'packages' context.
* lisp/doom-cli.el:
- (doom-before-init-hook, doom-after-init-hook): trigger hooks at the
correct time. This may increase startup load time, as the benchmark
now times more of the startup process.
- (doom-cli-execute, doom-cli-context-execute,
doom-cli-context-restore, doom-cli-context-parse,
doom-cli--output-benchmark-h, doom-cli-call, doom-cli--restart,
doom-cli-load, run!): remove redundant context prefix in debug logs,
it's now redundant with doom-context, which doom-log now prefixes
them with.
* lisp/doom-lib.el (doom-log): prefix doom-context to doom-log output,
unless it starts with :.
* lisp/doom-packages.el (package!, doom-packages--read): throw error if
not used in a packages.el file or in the context of our package
manager.
* lisp/doom-profiles.el (doom-profile--generate-init-vars,
doom-profile--generate-load-modules): use modules doom-context instead
of doom-init-time to detect startup.
* lisp/doom-start.el (doom-load-packages-incrementally-h): move function
closer to end of doom-after-init-hook.
* lisp/doom.el:
- (doom-before-init-hook, doom--set-initial-values-h,
doom--begin-init-h): rename doom--set-initial-values-h to
doom--begin-init-h and ensure it runs as late in
doom-before-init-hook as possible, as that is the point where Doom's
"initialization" formally begins.
- (doom-after-init-hook): don't trigger at the end of command-line-1
in non-interactive sessions. This will be triggered manually in
doom-cli.el's run!.
* lisp/lib/config.el (doom/reload, doom/reload-autoloads,
doom/reload-env): use 'reload' context for reload commands.
* modules/lang/emacs-lisp/autoload.el (+emacs-lisp-eval): use 'eval'
context.
* modules/lang/org/config.el: remove doom-reloading-p; check for
'reload' doom context instead.
2022-09-24 12:38:25 +02:00
|
|
|
`((if (or (doom-context-p 'init)
|
|
|
|
|
(doom-context-p 'reload))
|
|
|
|
|
(doom-context-with 'modules
|
|
|
|
|
(set 'doom-modules ',doom-modules)
|
|
|
|
|
(set 'doom-disabled-packages ',doom-disabled-packages)
|
|
|
|
|
;; Cache module state and flags in symbol plists for quick lookup by
|
|
|
|
|
;; `modulep!' later.
|
|
|
|
|
,@(cl-loop
|
|
|
|
|
for (category . modules) in (seq-group-by #'car config-modules-list)
|
|
|
|
|
collect
|
|
|
|
|
`(setplist ',category
|
|
|
|
|
(quote ,(cl-loop for (_ . module) in modules
|
|
|
|
|
nconc `(,module ,(get category module))))))
|
|
|
|
|
(let ((old-custom-file custom-file))
|
|
|
|
|
,@(module-list-loader pre-init-modules init-file)
|
|
|
|
|
(doom-run-hooks 'doom-before-modules-init-hook)
|
|
|
|
|
,@(module-list-loader init-modules init-file)
|
|
|
|
|
(doom-run-hooks 'doom-after-modules-init-hook)
|
|
|
|
|
(doom-run-hooks 'doom-before-modules-config-hook)
|
|
|
|
|
,@(module-list-loader config-modules config-file)
|
|
|
|
|
(doom-run-hooks 'doom-after-modules-config-hook)
|
|
|
|
|
,@(module-list-loader post-config-modules config-file t)
|
|
|
|
|
(when (eq custom-file old-custom-file)
|
|
|
|
|
(doom-load custom-file 'noerror)))))))))
|
refactor!: complete profile gen and init systems
BREAKING CHANGE: This commit makes three breaking changes:
- Doom now fully and dynamically generates (and byte-compiles) your
profile and its init files, which includes your autoloads, loading
your init files and modules, and then some. This replaces
doom-initialize-modules, doom-initialize-core-modules, and
doom-module-loader, which have been removed. This has also improved
startup time by a bit, but if you use these functions in your CLIs,
for instance, this will be a breaking change.
- `doom sync` is now required for Doom to see your profiles (and must be
run whenever you change them, or when you up/downgrade Emacs across
major versions).
- $DOOMDIR/init.el is now read much earlier than it used to be. Before
any of doom-{ui,keybinds,editor,projects}, before any autoloads are
loaded, and before your load-path has been populated with your
packages. It now runs in the context of early-init.el, giving users
freer range over what they can affect, but a more minimalistic
environment to do it in.
If you must have some logic run when all that is set up, add it to one
of the module hooks added in e08f68b or 283308a.
This also poses a significant change to Doom's load order (see the
commentary change in lib/doom.el), along with the following (non
breaking) changes:
1. Adds a new `doom profiles sync` command. This will forcibly resync
your profiles, while `doom sync` will only do so if your profiles
have changed.
2. Doom now fully and dynamically generates (and byte-compiles) your
user-init-file, which includes loading all your init files, modules,
and custom-file. This replaces the job of doom-initialize-modules,
doom-initialize-core-modules, and doom-module-loader, which have been
removed. This has also improved startup time by a bit.
3. Defines new doom-state-dir variable, though not used yet (saving that
and the other breaking changes for the 3.0 release).
4. Redesigns profile directory variables (doom-profile-*-dir) to prepare
for future XDG-compliance.
5. Removed unused/unimportant profile variables in doom.el.
6. Added lisp/doom-profiles.el. It's hardly feature complete, but it's
enough to power the system as it is now.
7. Updates the "load order" commentary in doom.el to reflect these
changes.
2022-09-15 18:53:06 +02:00
|
|
|
|
|
|
|
|
(defun doom-profile--generate-doom-autoloads ()
|
|
|
|
|
(doom-autoloads--scan
|
|
|
|
|
(append (doom-glob doom-core-dir "lib/*.el")
|
|
|
|
|
(cl-loop for dir
|
|
|
|
|
in (append (doom-module-load-path doom-modules-dirs)
|
|
|
|
|
(list doom-user-dir))
|
|
|
|
|
if (doom-glob dir "autoload.el") collect (car it)
|
|
|
|
|
if (doom-glob dir "autoload/*.el") append it)
|
|
|
|
|
(mapcan #'doom-glob doom-autoloads-files))
|
|
|
|
|
nil))
|
|
|
|
|
|
|
|
|
|
(defun doom-profile--generate-package-autoloads ()
|
|
|
|
|
(doom-autoloads--scan
|
|
|
|
|
(mapcar #'straight--autoloads-file
|
|
|
|
|
(seq-difference (hash-table-keys straight--build-cache)
|
|
|
|
|
doom-autoloads-excluded-packages))
|
|
|
|
|
doom-autoloads-excluded-files
|
|
|
|
|
'literal))
|
|
|
|
|
|
|
|
|
|
(provide 'doom-profiles)
|
|
|
|
|
;;; doom-profiles.el ends here
|