From b9933e6637713ecf518e9ab26fccad5569c0d9fd Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 30 Jul 2022 21:49:00 +0200 Subject: [PATCH] refactor!: restructure Doom core BREAKING CHANGE: This restructures the project in preparation for Doom to be split into two repos. Users that have reconfigured Doom's CLI stand a good chance of seeing breakage, especially if they've referred to any core-* feature, e.g. (after! core-cli-ci ...) To fix it, simply s/core-/doom-/, i.e. (after! doom-cli-ci ...) What this commit specifically changes is: - Renames all core features from core-* to doom-* - Moves core/core-* -> lisp/doom-* - Moves core/autoloads/* -> lisp/lib/* - Moves core/templates -> templates/ Ref: #4273 --- bin/doom | 4 +-- bin/doomscript | 2 +- ci.el | 4 +-- early-init.el | 8 ++--- {core => lisp}/cli/autoloads.el | 10 +++---- {core => lisp}/cli/ci.el | 4 +-- {core => lisp}/cli/compile.el | 8 ++--- {core => lisp}/cli/doctor.el | 6 ++-- {core => lisp}/cli/env.el | 4 +-- {core => lisp}/cli/help.el | 4 +-- {core => lisp}/cli/info.el | 4 +-- {core => lisp}/cli/install.el | 15 +++++----- {core => lisp}/cli/make.el | 4 +-- {core => lisp}/cli/make/completions.el | 2 +- {core => lisp}/cli/packages.el | 6 ++-- {core => lisp}/cli/run.el | 4 +-- {core => lisp}/cli/sync.el | 4 +-- {core => lisp}/cli/test.el | 4 +-- {core => lisp}/cli/upgrade.el | 2 +- core/core-cli-lib.el => lisp/doom-cli-lib.el | 8 ++--- core/core-cli.el => lisp/doom-cli.el | 30 +++++++++---------- core/core-editor.el => lisp/doom-editor.el | 6 ++-- .../core-keybinds.el => lisp/doom-keybinds.el | 6 ++-- core/core-lib.el => lisp/doom-lib.el | 8 ++--- core/core-modules.el => lisp/doom-modules.el | 16 +++++----- .../core-packages.el => lisp/doom-packages.el | 6 ++-- .../core-projects.el => lisp/doom-projects.el | 6 ++-- core/core-start.el => lisp/doom-start.el | 12 ++++---- core/core-ui.el => lisp/doom-ui.el | 6 ++-- core/core.el => lisp/doom.el | 15 +++++----- {core/autoload => lisp/lib}/buffers.el | 2 +- {core/autoload => lisp/lib}/config.el | 4 +-- {core/autoload => lisp/lib}/debug.el | 4 +-- {core/autoload => lisp/lib}/files.el | 2 +- {core/autoload => lisp/lib}/fonts.el | 2 +- {core/autoload => lisp/lib}/help.el | 6 ++-- {core/autoload => lisp/lib}/packages.el | 2 +- {core/autoload => lisp/lib}/plist.el | 2 +- {core/autoload => lisp/lib}/print.el | 2 +- {core/autoload => lisp/lib}/process.el | 2 +- {core/autoload => lisp/lib}/projects.el | 2 +- {core/autoload => lisp/lib}/sandbox.el | 6 ++-- {core/autoload => lisp/lib}/scratch.el | 2 +- {core/autoload => lisp/lib}/sessions.el | 2 +- {core/autoload => lisp/lib}/store.el | 2 +- {core/autoload => lisp/lib}/system.el | 2 +- {core/autoload => lisp/lib}/text.el | 2 +- {core/autoload => lisp/lib}/themes.el | 2 +- {core/autoload => lisp/lib}/ui.el | 2 +- {core => lisp}/packages.el | 16 +++++----- modules/lang/emacs-lisp/autoload.el | 4 +-- modules/lang/emacs-lisp/demos.org | 4 +-- {core/templates => templates}/BUG_REPORT | 0 .../templates => templates}/QUICKSTART_INTRO | 0 {core/templates => templates}/VANILLA_SANDBOX | 0 .../templates => templates}/config.example.el | 0 init.example.el => templates/init.example.el | 0 .../packages.example.el | 0 {core/test => test}/test-autoload-buffers.el | 0 {core/test => test}/test-autoload-files.el | 0 {core/test => test}/test-autoload-format.el | 0 {core/test => test}/test-autoload-package.el | 0 {core/test => test}/test-core-keybinds.el | 0 {core/test => test}/test-core-lib.el | 0 {core/test => test}/test-core-modules.el | 0 {core/test => test}/test-core-packages.el | 0 {core/test => test}/test-core-projects.el | 0 {core/test => test}/test-core-ui.el | 0 {core/test => test}/test-core.el | 0 69 files changed, 147 insertions(+), 145 deletions(-) rename {core => lisp}/cli/autoloads.el (97%) rename {core => lisp}/cli/ci.el (99%) rename {core => lisp}/cli/compile.el (98%) rename {core => lisp}/cli/doctor.el (99%) rename {core => lisp}/cli/env.el (98%) rename {core => lisp}/cli/help.el (99%) rename {core => lisp}/cli/info.el (89%) rename {core => lisp}/cli/install.el (89%) rename {core => lisp}/cli/make.el (94%) rename {core => lisp}/cli/make/completions.el (98%) rename {core => lisp}/cli/packages.el (99%) rename {core => lisp}/cli/run.el (97%) rename {core => lisp}/cli/sync.el (96%) rename {core => lisp}/cli/test.el (93%) rename {core => lisp}/cli/upgrade.el (99%) rename core/core-cli-lib.el => lisp/doom-cli-lib.el (99%) rename core/core-cli.el => lisp/doom-cli.el (91%) rename core/core-editor.el => lisp/doom-editor.el (99%) rename core/core-keybinds.el => lisp/doom-keybinds.el (99%) rename core/core-lib.el => lisp/doom-lib.el (99%) rename core/core-modules.el => lisp/doom-modules.el (99%) rename core/core-packages.el => lisp/doom-packages.el (99%) rename core/core-projects.el => lisp/doom-projects.el (99%) rename core/core-start.el => lisp/doom-start.el (97%) rename core/core-ui.el => lisp/doom-ui.el (99%) rename core/core.el => lisp/doom.el (98%) rename {core/autoload => lisp/lib}/buffers.el (99%) rename {core/autoload => lisp/lib}/config.el (97%) rename {core/autoload => lisp/lib}/debug.el (99%) rename {core/autoload => lisp/lib}/files.el (99%) rename {core/autoload => lisp/lib}/fonts.el (99%) rename {core/autoload => lisp/lib}/help.el (99%) rename {core/autoload => lisp/lib}/packages.el (99%) rename {core/autoload => lisp/lib}/plist.el (96%) rename {core/autoload => lisp/lib}/print.el (99%) rename {core/autoload => lisp/lib}/process.el (96%) rename {core/autoload => lisp/lib}/projects.el (99%) rename {core/autoload => lisp/lib}/sandbox.el (97%) rename {core/autoload => lisp/lib}/scratch.el (99%) rename {core/autoload => lisp/lib}/sessions.el (98%) rename {core/autoload => lisp/lib}/store.el (99%) rename {core/autoload => lisp/lib}/system.el (98%) rename {core/autoload => lisp/lib}/text.el (99%) rename {core/autoload => lisp/lib}/themes.el (98%) rename {core/autoload => lisp/lib}/ui.el (99%) rename {core => lisp}/packages.el (93%) rename {core/templates => templates}/BUG_REPORT (100%) rename {core/templates => templates}/QUICKSTART_INTRO (100%) rename {core/templates => templates}/VANILLA_SANDBOX (100%) rename {core/templates => templates}/config.example.el (100%) rename init.example.el => templates/init.example.el (100%) rename {core/templates => templates}/packages.example.el (100%) rename {core/test => test}/test-autoload-buffers.el (100%) rename {core/test => test}/test-autoload-files.el (100%) rename {core/test => test}/test-autoload-format.el (100%) rename {core/test => test}/test-autoload-package.el (100%) rename {core/test => test}/test-core-keybinds.el (100%) rename {core/test => test}/test-core-lib.el (100%) rename {core/test => test}/test-core-modules.el (100%) rename {core/test => test}/test-core-packages.el (100%) rename {core/test => test}/test-core-projects.el (100%) rename {core/test => test}/test-core-ui.el (100%) rename {core/test => test}/test-core.el (100%) diff --git a/bin/doom b/bin/doom index 3dda9e642..d228c9738 100755 --- a/bin/doom +++ b/bin/doom @@ -62,7 +62,7 @@ ;; Put together, plus a strategically placed exit call, the shell will read ;; one part of this file and ignore the rest, while the elisp interpreter will ;; do the opposite. -;; - I intentionally avoid loading site files, so core/core-cli.el can load them +;; - I intentionally avoid loading site files, so lisp/doom-cli.el can load them ;; by hand later. There, I can suppress and deal with unhelpful warnings (e.g. ;; "package cl is deprecated"), "Loading X...DONE" spam, and any other ;; disasterous side-effects. @@ -107,7 +107,7 @@ ;; ;;; Load Doom's CLI framework -(require 'core-cli (expand-file-name "core/core-cli" user-emacs-directory)) +(require 'doom-cli (expand-file-name "lisp/doom-cli" user-emacs-directory)) ;; Load $DOOMDIR/init.el, to read the user's `doom!' block, and so users can ;; customize things early, if they like. diff --git a/bin/doomscript b/bin/doomscript index 4a8c133a4..4af182f4d 100755 --- a/bin/doomscript +++ b/bin/doomscript @@ -40,7 +40,7 @@ tmpfile="$TMPDIR/doomscript.${__DOOMPID}" target="$1" shift -$emacs --load "$EMACSDIR/core/core-cli" \ +$emacs --load "$EMACSDIR/lisp/doom-cli" \ --load "$target" \ -- "$@" || exit=$? # Execute exit-script, if requested (to simulate execve) diff --git a/ci.el b/ci.el index dcb4b1168..72ba72e5d 100644 --- a/ci.el +++ b/ci.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(after! core-cli-ci +(after! doom-cli-ci ;;; Commit linter types (add-to-list 'doom-ci-commit-types 'module) (add-to-list 'doom-ci-commit-scopeless-types 'module) @@ -16,7 +16,7 @@ ;; DEPRECATED Will be removed once modules live in their own repo (add-to-list 'doom-ci-commit-scopes '(release "modules"))) -(after! core-cli-make +(after! doom-cli-make ;;; Codeowners ;; (dolist (path (cdr (doom-module-load-path (list doom-modules-dir)))) ;; (save-match-data diff --git a/early-init.el b/early-init.el index 19ff8a768..8bc30d546 100644 --- a/early-init.el +++ b/early-init.el @@ -15,7 +15,7 @@ ;; $EMACSDIR/profiles.el or implicitly as directories in $EMACSDIR/profiles/). ;; ;; You should *never* load this file in non-interactive sessions (e.g. batch -;; scripts). Load `core-start' or use 'doom run' instead! +;; scripts). Load `doom-start' or use 'doom run' instead! ;; ;;; Code: @@ -133,7 +133,7 @@ ;;; Bootstrap ;; Load the heart of Doom Emacs -(unless (load (expand-file-name "core/core" user-emacs-directory) t (not init-file-debug)) +(unless (require 'doom (expand-file-name "lisp/doom" user-emacs-directory) t) ;; ...but if that fails, then this is likely not a Doom config. (setq early-init-file (expand-file-name "early-init" user-emacs-directory)) (load early-init-file t (not init-file-debug))) @@ -147,7 +147,7 @@ ;; $EMACSDIR as their $DOOMDIR, if they wanted). ;; - Later, 'doom sync' will dynamically generate its bootstrap file, which ;; will be important for Doom's profile system later. Until then, we'll use -;; core/core-start.el. +;; lisp/doom-start.el. ;; - A "fallback" initfile can be trivially specified, in case the ;; bootstrapper is missing (if the user hasn't run 'doom sync' or is a ;; first-timer). This is an opportunity to display a "safe mode" environment @@ -158,7 +158,7 @@ "Initialize Doom Emacs in an interactive session." (list (lambda () (if (boundp 'doom-core-dir) - (expand-file-name "core-start" doom-core-dir) + (expand-file-name "doom-start" doom-core-dir) (expand-file-name "init.el" user-emacs-directory))) (when (boundp 'doom-profiles-dir) (lambda () diff --git a/core/cli/autoloads.el b/lisp/cli/autoloads.el similarity index 97% rename from core/cli/autoloads.el rename to lisp/cli/autoloads.el index 39603a7d5..d3952b698 100644 --- a/core/cli/autoloads.el +++ b/lisp/cli/autoloads.el @@ -1,4 +1,4 @@ -;;; core/cli/autoloads.el -*- lexical-binding: t; -*- +;;; lisp/cli/autoloads.el -*- lexical-binding: t; -*- (defvar doom-autoloads-excluded-packages () "What packages whose autoloads files we won't index. @@ -49,9 +49,9 @@ one wants that.") when (boundp var) collect `(set ',var ',(symbol-value var))) (doom-autoloads--scan - (append (cl-loop for dir - in (append (list doom-core-dir) - (cdr (doom-module-load-path 'all-p)) + (append (doom-glob doom-core-dir "lib/*.el") + (cl-loop for dir + in (append (cdr (doom-module-load-path 'all-p)) (list doom-private-dir)) if (doom-glob dir "autoload.el") collect (car it) if (doom-glob dir "autoload/*.el") append it) @@ -64,7 +64,7 @@ one wants that.") doom-autoloads-excluded-files 'literal) ;; TODO Uncomment when profile system is implemented - ;; `((unless noninteractive (require 'core-start))) + ;; `((unless noninteractive (require 'doom-start))) ) (print! (start "Byte-compiling autoloads file...")) (doom-autoloads--compile-file file) diff --git a/core/cli/ci.el b/lisp/cli/ci.el similarity index 99% rename from core/cli/ci.el rename to lisp/cli/ci.el index b31ad420c..ee5dd3137 100644 --- a/core/cli/ci.el +++ b/lisp/cli/ci.el @@ -1,4 +1,4 @@ -;;; core/cli/ci.el -*- lexical-binding: t; -*- +;;; lisp/cli/ci.el -*- lexical-binding: t; -*- ;; ;;; Variables @@ -468,5 +468,5 @@ Prevents pushing if there are unrebased or WIP commits." (exit! 1))) t))) -(provide 'core-cli-ci) +(provide 'doom-cli-ci) ;;; ci.el ends here diff --git a/core/cli/compile.el b/lisp/cli/compile.el similarity index 98% rename from core/cli/compile.el rename to lisp/cli/compile.el index 3737d6b0c..7f79e162c 100644 --- a/core/cli/compile.el +++ b/lisp/cli/compile.el @@ -1,4 +1,4 @@ -;;; core/cli/commands/byte-compile.el -*- lexical-binding: t; -*- +;;; lisp/cli/commands/byte-compile.el -*- lexical-binding: t; -*- ;; ;;; Variables @@ -96,7 +96,7 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files." ;; fully loaded. Which usually aren't so in an noninteractive session. (let ((load-prefer-newer t) (noninteractive t)) - (require 'core-start) + (require 'doom-start) (quiet! (doom-initialize-packages)) (quiet! (doom-initialize-modules)))) @@ -192,7 +192,7 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files." (defun doom-compile-clean () "Delete all the compiled elc files in your Emacs configuration and private module. This does not include your byte-compiled, third party packages.'" - (require 'core-modules) + (require 'doom-modules) (print! (start "Cleaning .elc files")) (print-group! (cl-loop with default-directory = doom-emacs-dir @@ -213,5 +213,5 @@ module. This does not include your byte-compiled, third party packages.'" (item "\033[KNo elc files to clean")))) t)) -(provide 'core-cli-compile) +(provide 'doom-cli-compile) ;;; compile.el ends here diff --git a/core/cli/doctor.el b/lisp/cli/doctor.el similarity index 99% rename from core/cli/doctor.el rename to lisp/cli/doctor.el index 327716c46..703322ecb 100644 --- a/core/cli/doctor.el +++ b/lisp/cli/doctor.el @@ -1,4 +1,4 @@ -;;; core/cli/doctor.el --- userland heuristics and Emacs diagnostics -*- lexical-binding: t; -*- +;;; lisp/cli/doctor.el --- userland heuristics and Emacs diagnostics -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -162,7 +162,7 @@ in." kill-emacs-query-functions kill-emacs-hook) (defvar doom-reloading-p nil) - (require 'core-start) + (require 'doom-start) (doom-initialize-packages)) (print! (success "Initialized Doom Emacs %s") doom-version) @@ -292,5 +292,5 @@ in." (success! "Everything seems fine, happy Emacs'ing!")) (exit! :pager? "+G")) -(provide 'core-cli-doctor) +(provide 'doom-cli-doctor) ;;; doctor.el ends here diff --git a/core/cli/env.el b/lisp/cli/env.el similarity index 98% rename from core/cli/env.el rename to lisp/cli/env.el index 8fb6216ef..f043f94c7 100644 --- a/core/cli/env.el +++ b/lisp/cli/env.el @@ -1,4 +1,4 @@ -;;; core/cli/env.el --- envvar file generator -*- lexical-binding: t; -*- +;;; lisp/cli/env.el --- envvar file generator -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -136,5 +136,5 @@ Why this over exec-path-from-shell? (delete-file env-file) (print! (success "Deleted %s") (path env-file)))) -(provide 'core-cli-env) +(provide 'doom-cli-env) ;;; env.el ends here diff --git a/core/cli/help.el b/lisp/cli/help.el similarity index 99% rename from core/cli/help.el rename to lisp/cli/help.el index fbe4f14b9..1c367577a 100644 --- a/core/cli/help.el +++ b/lisp/cli/help.el @@ -1,4 +1,4 @@ -;;; ../../projects/dotfiles/emacs/core/cli/help.el -*- lexical-binding: t; -*- +;;; lisp/cli/help.el -*- lexical-binding: t; -*- ;;; Commentary: ;; ;; This file defines special commands that the Doom CLI will invoke when a @@ -462,5 +462,5 @@ The alist's CAR are lists of formatted switches plus their arguments, e.g. (string-trim-right (buffer-string)))))) "\n\n")))))))))) -(provide 'core-cli-help) +(provide 'doom-cli-help) ;;; help.el ends here diff --git a/core/cli/info.el b/lisp/cli/info.el similarity index 89% rename from core/cli/info.el rename to lisp/cli/info.el index e0a222b8d..c2280b39c 100644 --- a/core/cli/info.el +++ b/lisp/cli/info.el @@ -1,4 +1,4 @@ -;;; core/cli/info.el --- information about your Doom install -*- lexical-binding: t; -*- +;;; lisp/cli/info.el --- information about your Doom install -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -30,5 +30,5 @@ (doom-cli-context-width context)))))) (print! "%s" (string-trim-right (buffer-string))))) -(provide 'core-cli-info) +(provide 'doom-cli-info) ;;; info.el ends here diff --git a/core/cli/install.el b/lisp/cli/install.el similarity index 89% rename from core/cli/install.el rename to lisp/cli/install.el index 3172c4ff7..0c9ed3e6a 100644 --- a/core/cli/install.el +++ b/lisp/cli/install.el @@ -1,4 +1,4 @@ -;;; core/cli/install.el --- Doom Emacs install wizard -*- lexical-binding: t; -*- +;;; lisp/cli/install.el --- Doom Emacs install wizard -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -27,7 +27,8 @@ This command does the following: 1. Creates `$DOOMDIR' at ~/.doom.d, - 2. Copies ~/.emacs.d/init.example.el to `$DOOMDIR'/init.el (if it doesn't exist), + 2. Copies ~/.emacs.d/templates/init.example.el to `$DOOMDIR'/init.el (if it + doesn't exist), 3. Creates dummy files for `$DOOMDIR'/{config,packages}.el, 4. Prompts you to generate an envvar file (same as `$ doom env`), 5. Installs any dependencies of enabled modules (specified by `$DOOMDIR'/init.el), @@ -69,9 +70,9 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g. (with-temp-file (doom-path doom-private-dir filename) (insert-file-contents template)) (print! (success "Done!"))))) - `(("init.el" . ,(doom-path doom-emacs-dir "init.example.el")) - ("config.el" . ,(doom-path doom-core-dir "templates/config.example.el")) - ("packages.el" . ,(doom-path doom-core-dir "templates/packages.example.el")))))) + `(("init.el" . ,(doom-path doom-emacs-dir "templates/init.example.el")) + ("config.el" . ,(doom-path doom-emacs-dir "templates/config.example.el")) + ("packages.el" . ,(doom-path doom-emacs-dir "templates/packages.example.el")))))) ;; In case no init.el was present the first time `doom-initialize-modules' was ;; called in core.el (e.g. on first install) @@ -124,8 +125,8 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g. (print! (success "\nFinished! Doom is ready to go!\n")) (with-temp-buffer - (insert-file-contents (doom-path doom-core-dir "templates/QUICKSTART_INTRO")) + (insert-file-contents (doom-path doom-emacs-dir "templates/QUICKSTART_INTRO")) (print! "%s" (buffer-string))))) -(provide 'core-cli-install) +(provide 'doom-cli-install) ;;; install.el ends here diff --git a/core/cli/make.el b/lisp/cli/make.el similarity index 94% rename from core/cli/make.el rename to lisp/cli/make.el index 0db84cb82..70a94765c 100644 --- a/core/cli/make.el +++ b/lisp/cli/make.el @@ -1,4 +1,4 @@ -;;; core/cli/make.el --- file generation commands -*- lexical-binding: t; -*- +;;; lisp/cli/make.el --- file generation commands -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -59,5 +59,5 @@ (when (buffer-modified-p) (save-buffer)))))) -(provide 'core-cli-make) +(provide 'doom-cli-make) ;;; make.el ends here diff --git a/core/cli/make/completions.el b/lisp/cli/make/completions.el similarity index 98% rename from core/cli/make/completions.el rename to lisp/cli/make/completions.el index 763759818..3402ba2aa 100644 --- a/core/cli/make/completions.el +++ b/lisp/cli/make/completions.el @@ -1,4 +1,4 @@ -;;; core/cli/make/completions.el --- generate shell completion scripts -*- lexical-binding: t; -*- +;;; lisp/cli/make/completions.el --- generate shell completion scripts -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: diff --git a/core/cli/packages.el b/lisp/cli/packages.el similarity index 99% rename from core/cli/packages.el rename to lisp/cli/packages.el index 45725eadc..e325f6e3c 100644 --- a/core/cli/packages.el +++ b/lisp/cli/packages.el @@ -1,4 +1,4 @@ -;;; core/cli/packages.el --- package management commands -*- lexical-binding: t; -*- +;;; lisp/cli/packages.el --- package management commands -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -591,7 +591,7 @@ declaration) or dependency thereof that hasn't already been." (delq nil (mapcar #'doom-packages--purge-repo repos)))))) (defun doom-packages--purge-elpa () - (require 'core-packages) + (require 'doom-packages) (let ((dirs (doom-files-in package-user-dir :type t :depth 0))) (if (not dirs) (prog1 0 @@ -809,5 +809,5 @@ However, in batch mode, print to stdout instead of stderr." "/dev/null"))) (apply fn args))) -(provide 'core-cli-packages) +(provide 'doom-cli-packages) ;;; packages.el ends here diff --git a/core/cli/run.el b/lisp/cli/run.el similarity index 97% rename from core/cli/run.el rename to lisp/cli/run.el index b901ff316..9026beca1 100644 --- a/core/cli/run.el +++ b/lisp/cli/run.el @@ -1,4 +1,4 @@ -;;; core/cli/run.el --- launching Emacs in a sandbox -*- lexical-binding: t; -*- +;;; lisp/cli/run.el --- launching Emacs in a sandbox -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -99,5 +99,5 @@ performance, it is best to run Doom out of ~/.config/emacs or ~/.emacs.d." (print! "%s %S" (bold "Details:") (cdr e)))))))) (terpri)))) -(provide 'core-cli-run) +(provide 'doom-cli-run) ;;; run.el ends here diff --git a/core/cli/sync.el b/lisp/cli/sync.el similarity index 96% rename from core/cli/sync.el rename to lisp/cli/sync.el index d0ff2537f..723ca07b9 100644 --- a/core/cli/sync.el +++ b/lisp/cli/sync.el @@ -1,4 +1,4 @@ -;;; core/cli/sync.el --- synchronize config command -*- lexical-binding: t; -*- +;;; lisp/cli/sync.el --- synchronize config command -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: @@ -80,5 +80,5 @@ OPTIONS: (print! (warn "Script was abruptly aborted, leaving Doom in an incomplete state!")) (print! (item "Run 'doom sync' to repair it."))) -(provide 'core-cli-sync) +(provide 'doom-cli-sync) ;;; sync.el ends here diff --git a/core/cli/test.el b/lisp/cli/test.el similarity index 93% rename from core/cli/test.el rename to lisp/cli/test.el index 5366cf3d3..d4023c48b 100644 --- a/core/cli/test.el +++ b/lisp/cli/test.el @@ -1,4 +1,4 @@ -;;; core/cli/test.el -*- lexical-binding: t; -*- +;;; lisp/cli/test.el -*- lexical-binding: t; -*- ;;; Commentary: ;; ;; The heart of Doom's test DSL and framework. Powered by either ERT or @@ -44,5 +44,5 @@ Should be one of: ;; Nothing here yet -(provide 'core-cli-test) +(provide 'doom-cli-test) ;;; test.el ends here diff --git a/core/cli/upgrade.el b/lisp/cli/upgrade.el similarity index 99% rename from core/cli/upgrade.el rename to lisp/cli/upgrade.el index 9112ea87c..279d78a6d 100644 --- a/core/cli/upgrade.el +++ b/lisp/cli/upgrade.el @@ -1,4 +1,4 @@ -;;; core/cli/upgrade.el -*- lexical-binding: t; -*- +;;; lisp/cli/upgrade.el -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: diff --git a/core/core-cli-lib.el b/lisp/doom-cli-lib.el similarity index 99% rename from core/core-cli-lib.el rename to lisp/doom-cli-lib.el index d52b25605..20aae8307 100644 --- a/core/core-cli-lib.el +++ b/lisp/doom-cli-lib.el @@ -1,4 +1,4 @@ -;;; core/core-cli-lib.el --- API+DSL for Doom's CLI framework -*- lexical-binding: t; -*- +;;; lisp/doom-cli-lib.el --- API+DSL for Doom's CLI framework -*- lexical-binding: t; -*- ;;; Commentary: ;; ;; The heart of Doom's CLI framework. This is safe to load in interactive @@ -1319,7 +1319,7 @@ COMMANDSPEC may be prefixed with any of these special keywords: You can define one for a specific COMMAND, or omit it to redefine the catch-all :dump handler. - The default implementation (living in core/core-cli.el) will either: + The default implementation (living in lisp/doom-cli.el) will either: a) Dump to stdout a list of `doom-cli' structs for the commands and pseudo commands that would've been executed had __DOOMDUMP not been set. @@ -1812,5 +1812,5 @@ errors to `doom-cli-error-file')." ;; TODO Make `git!' into a more sophisticated wrapper around git (defalias 'git! (doom-partial #'straight--process-run "git")) -(provide 'core-cli-lib) -;;; core-cli-lib.el ends here +(provide 'doom-cli-lib) +;;; doom-cli-lib.el ends here diff --git a/core/core-cli.el b/lisp/doom-cli.el similarity index 91% rename from core/core-cli.el rename to lisp/doom-cli.el index 3b7b1b551..ef291e6bc 100644 --- a/core/core-cli.el +++ b/lisp/doom-cli.el @@ -1,8 +1,8 @@ -;;; core/core-cli.el --- The heart of Doom's CLI framework -*- lexical-binding: t; no-byte-compile: t; -*- +;;; lisp/doom-cli.el --- The heart of Doom's CLI framework -*- lexical-binding: t; no-byte-compile: t; -*- ;;; Commentary: ;; ;; The bootstrapper for Doom's CLI. This is *not* safe to load in interactive -;; sessions as it has many side-effects. Loads `core-cli-lib' instead for API +;; sessions as it has many side-effects. Loads `doom-cli-lib' instead for API ;; access and syntax highlighting. ;; ;;; Code: @@ -85,23 +85,23 @@ (load site-run-file t inhibit-message)))) ;; Just the... bear necessities~ -(require 'core (expand-file-name "core" (file-name-directory load-file-name))) +(require 'doom (expand-file-name "doom" (file-name-directory load-file-name))) ;; Load these eagerly, since autoloads haven't been generated/loaded yet -(load! "autoload/process") -(load! "autoload/system") -(load! "autoload/plist") -(load! "autoload/files") -(load! "autoload/debug") -(load! "autoload/print") -;; (load! "autoload/autoloads") +(load! "lib/process") +(load! "lib/system") +(load! "lib/plist") +(load! "lib/files") +(load! "lib/debug") +(load! "lib/print") +;; (load! "lib/autoloads") ;; Ensure straight and core packages are ready to go for CLI commands. -(require 'core-modules) -(require 'core-packages) +(require 'doom-modules) +(require 'doom-packages) ;; Our DSL, API, and everything nice. -(require 'core-cli-lib) +(require 'doom-cli-lib) ;; Don't generate superfluous files when writing temp buffers. (setq make-backup-files nil) @@ -146,5 +146,5 @@ ;; Kill manually so we don't save output to logs. (let (kill-emacs) (kill-emacs 0)))) -(provide 'core-cli) -;;; core-cli.el ends here +(provide 'doom-cli) +;;; doom-cli.el ends here diff --git a/core/core-editor.el b/lisp/doom-editor.el similarity index 99% rename from core/core-editor.el rename to lisp/doom-editor.el index 0750367f8..afd49e886 100644 --- a/core/core-editor.el +++ b/lisp/doom-editor.el @@ -1,4 +1,4 @@ -;;; core-editor.el -*- lexical-binding: t; -*- +;;; doom-editor.el -*- lexical-binding: t; -*- (defvar doom-detect-indentation-excluded-modes '(fundamental-mode pascal-mode so-long-mode) @@ -720,5 +720,5 @@ on." ;; which causes folks to redundantly install their own. (setq ws-butler-keep-whitespace-before-point nil)) -(provide 'core-editor) -;;; core-editor.el ends here +(provide 'doom-editor) +;;; doom-editor.el ends here diff --git a/core/core-keybinds.el b/lisp/doom-keybinds.el similarity index 99% rename from core/core-keybinds.el rename to lisp/doom-keybinds.el index d1f5affd2..cf02235f1 100644 --- a/core/core-keybinds.el +++ b/lisp/doom-keybinds.el @@ -1,4 +1,4 @@ -;;; core-keybinds.el -*- lexical-binding: t; -*- +;;; doom-keybinds.el -*- lexical-binding: t; -*- ;; A centralized keybinds system, integrated with `which-key' to preview ;; available keybindings. All built into one powerful macro: `map!'. If evil is @@ -458,5 +458,5 @@ States (map! :leader :n :desc \"Description\" \"C-c\" #'dosomething)" (doom--map-process rest)) -(provide 'core-keybinds) -;;; core-keybinds.el ends here +(provide 'doom-keybinds) +;;; doom-keybinds.el ends here diff --git a/core/core-lib.el b/lisp/doom-lib.el similarity index 99% rename from core/core-lib.el rename to lisp/doom-lib.el index fe15d66e0..f01ebd5a4 100644 --- a/core/core-lib.el +++ b/lisp/doom-lib.el @@ -1,4 +1,4 @@ -;;; core-lib.el -*- lexical-binding: t; -*- +;;; doom-lib.el -*- lexical-binding: t; -*- (require 'cl-lib) @@ -545,7 +545,7 @@ This is a wrapper around `eval-after-load' that: (defun doom--handle-load-error (e target path) (let* ((source (file-name-sans-extension target)) - (err (cond ((not (featurep 'core)) + (err (cond ((not (featurep 'doom)) (cons 'error (file-name-directory path))) ((file-in-directory-p source doom-core-dir) (cons 'doom-error doom-core-dir)) @@ -813,5 +813,5 @@ This function accepts any number of ARGUMENTS, but ignores them. Also see `ignore'." t)) -(provide 'core-lib) -;;; core-lib.el ends here +(provide 'doom-lib) +;;; doom-lib.el ends here diff --git a/core/core-modules.el b/lisp/doom-modules.el similarity index 99% rename from core/core-modules.el rename to lisp/doom-modules.el index 6ac0b3ae5..4f0ea60c8 100644 --- a/core/core-modules.el +++ b/lisp/doom-modules.el @@ -1,4 +1,4 @@ -;;; core-modules.el --- module & package management system -*- lexical-binding: t; -*- +;;; doom-modules.el --- module & package management system -*- lexical-binding: t; -*- (defvar doom-init-modules-p nil "Non-nil if `doom-initialize-modules' has run.") @@ -89,10 +89,10 @@ before the user's private module.") (defun doom-initialize-core-modules () "Load Doom's core files for an interactive session." - (require 'core-keybinds) - (require 'core-ui) - (require 'core-projects) - (require 'core-editor)) + (require 'doom-keybinds) + (require 'doom-ui) + (require 'doom-projects) + (require 'doom-editor)) (defun doom-module-loader (file) "Return a closure that loads FILE from a module. @@ -459,7 +459,7 @@ should contain your `doom!' block). The overall load order of Doom is as follows: ~/.emacs.d/init.el - ~/.emacs.d/core/core.el + ~/.emacs.d/lisp/doom.el $DOOMDIR/init.el {$DOOMDIR,~/.emacs.d}/modules/*/*/init.el `doom-before-init-modules-hook' @@ -572,5 +572,5 @@ CATEGORY and MODULE can be omitted When this macro is used from inside a module category module flag (file!))))) t)) -(provide 'core-modules) -;;; core-modules.el ends here +(provide 'doom-modules) +;;; doom-modules.el ends here diff --git a/core/core-packages.el b/lisp/doom-packages.el similarity index 99% rename from core/core-packages.el rename to lisp/doom-packages.el index 82e9d6979..2008bfb8a 100644 --- a/core/core-packages.el +++ b/lisp/doom-packages.el @@ -1,4 +1,4 @@ -;;; core/core-packages.el -*- lexical-binding: t; -*- +;;; lisp/doom-packages.el -*- lexical-binding: t; -*- ;; Emacs package management is opinionated, and so is Doom. Doom uses `straight' ;; to create a declarative, lazy-loaded and (nominally) reproducible package @@ -598,5 +598,5 @@ should use it!" else if (symbolp target) collect target))))) -(provide 'core-packages) -;;; core-packages.el ends here +(provide 'doom-packages) +;;; doom-packages.el ends here diff --git a/core/core-projects.el b/lisp/doom-projects.el similarity index 99% rename from core/core-projects.el rename to lisp/doom-projects.el index 23d14df0d..963826022 100644 --- a/core/core-projects.el +++ b/lisp/doom-projects.el @@ -1,4 +1,4 @@ -;;; core-projects.el -*- lexical-binding: t; -*- +;;; doom-projects.el -*- lexical-binding: t; -*- (defvar doom-projectile-cache-limit 10000 "If any project cache surpasses this many files it is purged when quitting @@ -295,5 +295,5 @@ Relevant: `doom-project-hook'." (match `((add-to-list 'auto-minor-mode-alist (cons ,match #',name))))))))) -(provide 'core-projects) -;;; core-projects.el ends here +(provide 'doom-projects) +;;; doom-projects.el ends here diff --git a/core/core-start.el b/lisp/doom-start.el similarity index 97% rename from core/core-start.el rename to lisp/doom-start.el index 1709a3af2..2f3a5b229 100644 --- a/core/core-start.el +++ b/lisp/doom-start.el @@ -1,8 +1,8 @@ -;;; core/core-start.el --- bootstrapper for interactive sessions -*- lexical-binding: t; -*- +;;; lisp/doom-start.el --- bootstrapper for interactive sessions -*- lexical-binding: t; -*- ;;; Commentary: ;;; Code: -(require 'core-modules) +(require 'doom-modules) ;; @@ -190,12 +190,12 @@ If RETURN-P, return the message as a string instead of displaying it." ;; There's a chance the user will later use package.el or straight in this ;; interactive session. If they do, make sure they're properly initialized ;; when they do. -(autoload 'doom-initialize-packages "core-packages") -(eval-after-load 'package '(require 'core-packages)) +(autoload 'doom-initialize-packages "doom-packages") +(eval-after-load 'package '(require 'doom-packages)) (eval-after-load 'straight '(doom-initialize-packages)) ;; Load all things. (doom-initialize-modules) -(provide 'core-start) -;;; core-start.el ends here +(provide 'doom-start) +;;; doom-start.el ends here diff --git a/core/core-ui.el b/lisp/doom-ui.el similarity index 99% rename from core/core-ui.el rename to lisp/doom-ui.el index 754294865..dbbae91a7 100644 --- a/core/core-ui.el +++ b/lisp/doom-ui.el @@ -1,4 +1,4 @@ -;;; core-ui.el -*- lexical-binding: t; -*- +;;; doom-ui.el -*- lexical-binding: t; -*- ;; ;;; Variables @@ -663,5 +663,5 @@ disable it to fix all that visual noise." (null (frame-parameter nil 'parent-frame))) (add-function :before-while whitespace-enable-predicate #'doom-is-childframes-p)) -(provide 'core-ui) -;;; core-ui.el ends here +(provide 'doom-ui) +;;; doom-ui.el ends here diff --git a/core/core.el b/lisp/doom.el similarity index 98% rename from core/core.el rename to lisp/doom.el index 11a59c04b..5d9c23964 100644 --- a/core/core.el +++ b/lisp/doom.el @@ -1,4 +1,4 @@ -;;; core.el --- the heart of the beast -*- lexical-binding: t; -*- +;;; doom.el --- the heart of the beast -*- lexical-binding: t; -*- ;; ;; Author: Henrik Lissner ;; URL: https://github.com/doomemacs/doomemacs @@ -33,7 +33,8 @@ ;; The overall load order of Doom is as follows: ;; ;; $EMACSDIR/early-init.el -;; $EMACSDIR/core/core.el +;; $EMACSDIR/lisp/doom.el +;; $EMACSDIR/lisp/doom-start.el ;; $DOOMDIR/init.el ;; {$DOOMDIR,~/.emacs.d}/modules/*/*/init.el ;; `doom-before-init-modules-hook' @@ -122,7 +123,7 @@ (defconst doom-emacs-dir user-emacs-directory "The path to the currently loaded .emacs.d directory. Must end with a slash.") -(defconst doom-core-dir (expand-file-name "core/" doom-emacs-dir) +(defconst doom-core-dir (expand-file-name "lisp/" doom-emacs-dir) "The root directory of Doom's core files. Must end with a slash.") (defconst doom-modules-dir (expand-file-name "modules/" doom-emacs-dir) @@ -240,7 +241,7 @@ Use this for files that change often, like cache files. Must end with a slash.") "Where `doom-reload-core-autoloads' stores its core autoloads. This file is responsible for informing Emacs where to find all of Doom's -autoloaded core functions (in core/autoload/*.el).") +autoloaded core functions (in lisp/lib/*.el).") (defconst doom-env-file (if doom-profile @@ -351,7 +352,7 @@ Otherwise, `en/disable-command' (in novice.el.gz) is hardcoded to write them to (add-to-list 'load-path doom-core-dir) ;; ...then load *the* one -(require 'core-lib) +(require 'doom-lib) ;; @@ -513,5 +514,5 @@ Otherwise, `en/disable-command' (in novice.el.gz) is hardcoded to write them to ;; compatibility fallbacks "gnutls-cli -p %p %h")) -(provide 'core) -;;; core.el ends here +(provide 'doom) +;;; doom.el ends here diff --git a/core/autoload/buffers.el b/lisp/lib/buffers.el similarity index 99% rename from core/autoload/buffers.el rename to lisp/lib/buffers.el index bb71b30b3..3d3a7b876 100644 --- a/core/autoload/buffers.el +++ b/lisp/lib/buffers.el @@ -1,4 +1,4 @@ -;;; core/autoload/buffers.el -*- lexical-binding: t; -*- +;;; lisp/lib/buffers.el -*- lexical-binding: t; -*- ;;;###autoload (defvar doom-real-buffer-functions diff --git a/core/autoload/config.el b/lisp/lib/config.el similarity index 97% rename from core/autoload/config.el rename to lisp/lib/config.el index 3b99527ea..92532c0f5 100644 --- a/core/autoload/config.el +++ b/lisp/lib/config.el @@ -1,4 +1,4 @@ -;;; core/autoload/config.el -*- lexical-binding: t; -*- +;;; lisp/lib/config.el -*- lexical-binding: t; -*- (defvar doom-bin-dir (expand-file-name "bin/" doom-emacs-dir)) (defvar doom-bin (expand-file-name "doom" doom-bin-dir)) @@ -79,7 +79,7 @@ Runs `doom-after-reload-hook' afterwards." (doom--if-compile (format "%S sync -e" doom-bin) (let ((doom-reloading-p t)) (doom-run-hooks 'doom-before-reload-hook) - (load "core-start") + (load "doom-start") (with-demoted-errors "PRIVATE CONFIG ERROR: %s" (general-auto-unbind-keys) (unwind-protect diff --git a/core/autoload/debug.el b/lisp/lib/debug.el similarity index 99% rename from core/autoload/debug.el rename to lisp/lib/debug.el index a858c55f9..f06da6da2 100644 --- a/core/autoload/debug.el +++ b/lisp/lib/debug.el @@ -1,4 +1,4 @@ -;;; core/autoload/debug.el -*- lexical-binding: t; -*- +;;; lisp/lib/debug.el -*- lexical-binding: t; -*- ;; ;;; Doom's debug mode @@ -209,7 +209,7 @@ Activate this advice with: "Returns diagnostic information about the current Emacs session in markdown, ready to be pasted in a bug report on github." (require 'vc-git) - (require 'core-packages) + (require 'doom-packages) (let ((default-directory doom-emacs-dir)) (letf! ((defun sh (&rest args) (cdr (apply #'doom-call-process args))) (defun cat (file &optional limit) diff --git a/core/autoload/files.el b/lisp/lib/files.el similarity index 99% rename from core/autoload/files.el rename to lisp/lib/files.el index 03681ebd6..0c0e21a25 100644 --- a/core/autoload/files.el +++ b/lisp/lib/files.el @@ -1,4 +1,4 @@ -;;; core/autoload/files.el -*- lexical-binding: t; -*- +;;; lisp/lib/files.el -*- lexical-binding: t; -*- (defun doom--resolve-path-forms (spec &optional directory) "Converts a simple nested series of or/and forms into a series of diff --git a/core/autoload/fonts.el b/lisp/lib/fonts.el similarity index 99% rename from core/autoload/fonts.el rename to lisp/lib/fonts.el index 558c97c0a..0855bec5d 100644 --- a/core/autoload/fonts.el +++ b/lisp/lib/fonts.el @@ -1,4 +1,4 @@ -;;; core/autoload/fonts.el -*- lexical-binding: t; -*- +;;; lisp/lib/fonts.el -*- lexical-binding: t; -*- ;;;###autoload (defvar doom-font-increment 2 diff --git a/core/autoload/help.el b/lisp/lib/help.el similarity index 99% rename from core/autoload/help.el rename to lisp/lib/help.el index 2eb188939..ce50e7110 100644 --- a/core/autoload/help.el +++ b/lisp/lib/help.el @@ -1,4 +1,4 @@ -;;; core/autoload/help.el -*- lexical-binding: t; -*- +;;; lisp/lib/help.el -*- lexical-binding: t; -*- (defvar doom--help-major-mode-module-alist '((dockerfile-mode :tools docker) @@ -323,7 +323,7 @@ without needing to check if they are available." (file-in-directory-p (symbol-file def) doom-core-dir)) collect (format (format "%%-%ds%%s" (+ maxwidth 4)) - def (propertize (format "core/%s.el" (file-name-sans-extension (file-relative-name (symbol-file def) doom-core-dir))) + def (propertize (format "lisp/%s.el" (file-name-sans-extension (file-relative-name (symbol-file def) doom-core-dir))) 'face 'font-lock-comment-face))) nil t (when (and (symbolp sym) @@ -517,7 +517,7 @@ If prefix arg is present, refresh the cache." packages nil t nil nil (when guess (symbol-name guess)))))))) ;; TODO Refactor me. - (require 'core-packages) + (require 'doom-packages) (doom-initialize-packages) (help-setup-xref (list #'doom/help-packages package) (called-interactively-p 'interactive)) diff --git a/core/autoload/packages.el b/lisp/lib/packages.el similarity index 99% rename from core/autoload/packages.el rename to lisp/lib/packages.el index a042b5069..85574fbd1 100644 --- a/core/autoload/packages.el +++ b/lisp/lib/packages.el @@ -1,4 +1,4 @@ -;;; core/autoload/packages.el -*- lexical-binding: t; -*- +;;; lisp/lib/packages.el -*- lexical-binding: t; -*- ;;;###autoload (defun doom/reload-packages () diff --git a/core/autoload/plist.el b/lisp/lib/plist.el similarity index 96% rename from core/autoload/plist.el rename to lisp/lib/plist.el index 5facb90e6..4ad875d22 100644 --- a/core/autoload/plist.el +++ b/lisp/lib/plist.el @@ -1,4 +1,4 @@ -;;; core/autoload/plist.el -*- lexical-binding: t; -*- +;;; lisp/lib/plist.el -*- lexical-binding: t; -*- ;; ;;; Macros diff --git a/core/autoload/print.el b/lisp/lib/print.el similarity index 99% rename from core/autoload/print.el rename to lisp/lib/print.el index 11e361d03..d9a6a33c8 100644 --- a/core/autoload/print.el +++ b/lisp/lib/print.el @@ -1,4 +1,4 @@ -;;; core/autoload/print.el -*- lexical-binding: t; -*- +;;; lisp/lib/print.el -*- lexical-binding: t; -*- ;;; Commentary ;;; ;;; This is Doom's output library, for controlling what does and doesn't get diff --git a/core/autoload/process.el b/lisp/lib/process.el similarity index 96% rename from core/autoload/process.el rename to lisp/lib/process.el index e368be785..9ae7d2234 100644 --- a/core/autoload/process.el +++ b/lisp/lib/process.el @@ -1,4 +1,4 @@ -;;; core/autoload/process.el -*- lexical-binding: t; -*- +;;; lisp/lib/process.el -*- lexical-binding: t; -*- ;;;###autoload (defun doom-call-process (command &rest args) diff --git a/core/autoload/projects.el b/lisp/lib/projects.el similarity index 99% rename from core/autoload/projects.el rename to lisp/lib/projects.el index 4df7dad85..76e840cc6 100644 --- a/core/autoload/projects.el +++ b/lisp/lib/projects.el @@ -1,4 +1,4 @@ -;;; core/autoload/projects.el -*- lexical-binding: t; -*- +;;; lisp/lib/projects.el -*- lexical-binding: t; -*- ;; HACK We forward declare these variables because they are let-bound in a ;; number of places with no guarantee that they've been defined yet (i.e. diff --git a/core/autoload/sandbox.el b/lisp/lib/sandbox.el similarity index 97% rename from core/autoload/sandbox.el rename to lisp/lib/sandbox.el index 3f059d917..4440f034e 100644 --- a/core/autoload/sandbox.el +++ b/lisp/lib/sandbox.el @@ -1,4 +1,4 @@ -;;; core/autoload/sandbox.el -*- lexical-binding: t; -*- +;;; lisp/lib/sandbox.el -*- lexical-binding: t; -*- (defvar doom-sandbox-buffer-name "*doom:sandbox*" "Name of the Doom sandbox buffer.") @@ -97,7 +97,7 @@ '(--run--)) (`vanilla-doom+ ; Doom core + modules - private config `(progn - (load-file ,(expand-file-name "core.el" doom-core-dir)) + (load-file ,(expand-file-name "doom.el" doom-core-dir)) (setq doom-modules-dirs (list doom-modules-dir)) (let ((doom-init-modules-p t)) (doom-initialize) @@ -114,7 +114,7 @@ (doom-run-hooks 'doom-init-modules-hook))) (`vanilla-doom ; only Doom core `(progn - (load-file ,(expand-file-name "core.el" doom-core-dir)) + (load-file ,(expand-file-name "doom.el" doom-core-dir)) (let ((doom-init-modules-p t)) (doom-initialize) (doom-initialize-core-modules)) diff --git a/core/autoload/scratch.el b/lisp/lib/scratch.el similarity index 99% rename from core/autoload/scratch.el rename to lisp/lib/scratch.el index 31a95ec96..a8c35a7ef 100644 --- a/core/autoload/scratch.el +++ b/lisp/lib/scratch.el @@ -1,4 +1,4 @@ -;;; core/autoload/scratch.el -*- lexical-binding: t; -*- +;;; lisp/lib/scratch.el -*- lexical-binding: t; -*- (defvar doom-scratch-default-file "__default" "The default file name for a project-less scratch buffer. diff --git a/core/autoload/sessions.el b/lisp/lib/sessions.el similarity index 98% rename from core/autoload/sessions.el rename to lisp/lib/sessions.el index 54e6c01c5..2619e7917 100644 --- a/core/autoload/sessions.el +++ b/lisp/lib/sessions.el @@ -1,4 +1,4 @@ -;;; core/autoload/sessions.el -*- lexical-binding: t; -*- +;;; lisp/lib/sessions.el -*- lexical-binding: t; -*- (defvar desktop-base-file-name) (defvar desktop-dirname) diff --git a/core/autoload/store.el b/lisp/lib/store.el similarity index 99% rename from core/autoload/store.el rename to lisp/lib/store.el index 651fb178e..424fde816 100644 --- a/core/autoload/store.el +++ b/lisp/lib/store.el @@ -1,4 +1,4 @@ -;;; core/autoload/cache.el -*- lexical-binding: t; -*- +;;; lisp/lib/cache.el -*- lexical-binding: t; -*- ;; This little library abstracts the process of writing arbitrary elisp values ;; to a 2-tiered file store (in `doom-store-dir'/`doom-store-location'). diff --git a/core/autoload/system.el b/lisp/lib/system.el similarity index 98% rename from core/autoload/system.el rename to lisp/lib/system.el index 76c12d972..20a868ba8 100644 --- a/core/autoload/system.el +++ b/lisp/lib/system.el @@ -1,4 +1,4 @@ -;;; core/autoload/system.el -*- lexical-binding: t; -*- +;;; lisp/lib/system.el -*- lexical-binding: t; -*- ;;;###autoload (defun doom-system-distro () diff --git a/core/autoload/text.el b/lisp/lib/text.el similarity index 99% rename from core/autoload/text.el rename to lisp/lib/text.el index fa743a30e..6c084489e 100644 --- a/core/autoload/text.el +++ b/lisp/lib/text.el @@ -1,4 +1,4 @@ -;;; core/autoload/text.el -*- lexical-binding: t; -*- +;;; lisp/lib/text.el -*- lexical-binding: t; -*- ;;;###autoload (defvar doom-point-in-comment-functions () diff --git a/core/autoload/themes.el b/lisp/lib/themes.el similarity index 98% rename from core/autoload/themes.el rename to lisp/lib/themes.el index 4c2e430a2..73c43a9bb 100644 --- a/core/autoload/themes.el +++ b/lisp/lib/themes.el @@ -1,4 +1,4 @@ -;;; core/autoload/themes.el -*- lexical-binding: t; -*- +;;; lisp/lib/themes.el -*- lexical-binding: t; -*- ;;;###autoload (defconst doom-customize-theme-hook nil) diff --git a/core/autoload/ui.el b/lisp/lib/ui.el similarity index 99% rename from core/autoload/ui.el rename to lisp/lib/ui.el index 9aa8e3756..8d255255d 100644 --- a/core/autoload/ui.el +++ b/lisp/lib/ui.el @@ -1,4 +1,4 @@ -;;; core/autoload/ui.el -*- lexical-binding: t; -*- +;;; lisp/lib/ui.el -*- lexical-binding: t; -*- ;; ;;; Public library diff --git a/core/packages.el b/lisp/packages.el similarity index 93% rename from core/packages.el rename to lisp/packages.el index cfcb22770..edea137f5 100644 --- a/core/packages.el +++ b/lisp/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- -;;; core/packages.el +;;; lisp/packages.el -;; core.el +;; doom.el (package! auto-minor-mode :pin "17cfa1b54800fdef2975c0c0531dad34846a5065") (package! gcmh :pin "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9") (package! explain-pause-mode @@ -9,7 +9,7 @@ :repo "lastquestion/explain-pause-mode") :pin "2356c8c3639cbeeb9751744dbe737267849b4b51") -;; core-packages.el +;; doom-packages.el (package! straight :type 'core :recipe `(:host github @@ -19,19 +19,19 @@ :files ("straight*.el")) :pin "fed215348076ba9182f634e0770a175220474b5a") -;; core-modules.el +;; doom-modules.el (package! use-package :type 'core :pin "0ad5d9d5d8a61517a207ab04bf69e71c081149eb") -;; core-ui.el +;; doom-ui.el (package! all-the-icons :pin "b18db6be0a290e8f91fd8d8340b2b44c8b75049a") (package! hide-mode-line :pin "bc5d293576c5e08c29e694078b96a5ed85631942") (package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307") (package! rainbow-delimiters :pin "a32b39bdfe6c61c322c37226d66e1b6d4f107ed0") (package! restart-emacs :pin "1607da2bc657fe05ae01f7fdf26f716eafead02c") -;; core-editor.el +;; doom-editor.el (package! better-jumper :pin "47622213783ece37d5337dc28d33b530540fc319") (package! dtrt-indent :pin "d4fd1b4977eb0d534844fddf01c3c51c70c57205") (package! helpful :pin "94a07d49a80f66f8ebc54a49a4b4f6899a65fbe3") @@ -43,10 +43,10 @@ :recipe (:host github :repo "hlissner/ws-butler") :pin "572a10c11b6cb88293de48acbb59a059d36f9ba5") -;; core-projects.el +;; doom-projects.el (package! projectile :pin "dc6e7ff658789e4c6cf7c32a4b4fdf22ef9bc5a3") (package! project :pin "2e8da1b811d5213bd143d9d036bf7ea14741a1ae") -;; core-keybinds.el +;; doom-keybinds.el (package! general :pin "9651024e7f40a8ac5c3f31f8675d3ebe2b667344") (package! which-key :pin "1ab1d0cc88843c9a614ed3226c5a1070e32e4823") diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el index 0b9370fff..b0b60ef8d 100644 --- a/modules/lang/emacs-lisp/autoload.el +++ b/modules/lang/emacs-lisp/autoload.el @@ -261,8 +261,8 @@ verbosity when editing a file in `doom-private-dir' or `doom-emacs-dir'." `(progn (setq doom-modules ',doom-modules doom-disabled-packages ',doom-disabled-packages) - (require 'core) - (require 'core-cli-lib) + (require 'doom) + (require 'doom-cli-lib) (ignore-errors (load ,user-init-file t t)) (setq byte-compile-warnings '(obsolete cl-functions diff --git a/modules/lang/emacs-lisp/demos.org b/modules/lang/emacs-lisp/demos.org index 9900a0e40..14538d435 100644 --- a/modules/lang/emacs-lisp/demos.org +++ b/modules/lang/emacs-lisp/demos.org @@ -7,7 +7,7 @@ usage in the documentation displayed by either ~describe-function~ or ~helpful-function~ (on [[kbd:][SPC h f]]). * Table of Contents :TOC_3: -- [[#core-lib][core-lib]] +- [[#doom-lib][doom-lib]] - [[#add-hook][add-hook!]] - [[#add-transient-hook][add-transient-hook!]] - [[#after][after!]] @@ -38,7 +38,7 @@ usage in the documentation displayed by either ~describe-function~ or - [[#unsetq-hook][unsetq-hook!]] - [[#use-package][use-package!]] -* core-lib +* doom-lib ** add-hook! :PROPERTIES: :added: pre-3.0.0 diff --git a/core/templates/BUG_REPORT b/templates/BUG_REPORT similarity index 100% rename from core/templates/BUG_REPORT rename to templates/BUG_REPORT diff --git a/core/templates/QUICKSTART_INTRO b/templates/QUICKSTART_INTRO similarity index 100% rename from core/templates/QUICKSTART_INTRO rename to templates/QUICKSTART_INTRO diff --git a/core/templates/VANILLA_SANDBOX b/templates/VANILLA_SANDBOX similarity index 100% rename from core/templates/VANILLA_SANDBOX rename to templates/VANILLA_SANDBOX diff --git a/core/templates/config.example.el b/templates/config.example.el similarity index 100% rename from core/templates/config.example.el rename to templates/config.example.el diff --git a/init.example.el b/templates/init.example.el similarity index 100% rename from init.example.el rename to templates/init.example.el diff --git a/core/templates/packages.example.el b/templates/packages.example.el similarity index 100% rename from core/templates/packages.example.el rename to templates/packages.example.el diff --git a/core/test/test-autoload-buffers.el b/test/test-autoload-buffers.el similarity index 100% rename from core/test/test-autoload-buffers.el rename to test/test-autoload-buffers.el diff --git a/core/test/test-autoload-files.el b/test/test-autoload-files.el similarity index 100% rename from core/test/test-autoload-files.el rename to test/test-autoload-files.el diff --git a/core/test/test-autoload-format.el b/test/test-autoload-format.el similarity index 100% rename from core/test/test-autoload-format.el rename to test/test-autoload-format.el diff --git a/core/test/test-autoload-package.el b/test/test-autoload-package.el similarity index 100% rename from core/test/test-autoload-package.el rename to test/test-autoload-package.el diff --git a/core/test/test-core-keybinds.el b/test/test-core-keybinds.el similarity index 100% rename from core/test/test-core-keybinds.el rename to test/test-core-keybinds.el diff --git a/core/test/test-core-lib.el b/test/test-core-lib.el similarity index 100% rename from core/test/test-core-lib.el rename to test/test-core-lib.el diff --git a/core/test/test-core-modules.el b/test/test-core-modules.el similarity index 100% rename from core/test/test-core-modules.el rename to test/test-core-modules.el diff --git a/core/test/test-core-packages.el b/test/test-core-packages.el similarity index 100% rename from core/test/test-core-packages.el rename to test/test-core-packages.el diff --git a/core/test/test-core-projects.el b/test/test-core-projects.el similarity index 100% rename from core/test/test-core-projects.el rename to test/test-core-projects.el diff --git a/core/test/test-core-ui.el b/test/test-core-ui.el similarity index 100% rename from core/test/test-core-ui.el rename to test/test-core-ui.el diff --git a/core/test/test-core.el b/test/test-core.el similarity index 100% rename from core/test/test-core.el rename to test/test-core.el