💥 Replace config/private w/ first-class support

The config/private module has been removed. ~/.doom.d (or
~/.config/doom; whichever is detected first) is now a first class
citizen of Doom and should just work(tm).

Your init.el only needs to contain:

  (require 'core (concat user-emacs-directory "core/core"))

And you may place your doom! block in ~/.doom.d/init.el (or
~/.config/doom/init.el).
This commit is contained in:
Henrik Lissner 2018-04-03 03:07:26 -04:00
parent b701303909
commit 355b4b1364
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
10 changed files with 31 additions and 79 deletions

View file

@ -53,6 +53,14 @@ Use this for files that change often, like cache files.")
(defvar doom-packages-dir (concat doom-local-dir "packages/")
"Where package.el and quelpa plugins (and their caches) are stored.")
(defvar doom-private-dir
(if (file-directory-p "~/.doom.d")
"~/.doom.d/"
(concat (or (getenv "XDG_CONFIG_HOME")
"~/.config")
"/doom/"))
"TODO")
(defconst EMACS26+ (not (version< emacs-version "26")))
(defconst EMACS27+ (not (version< emacs-version "27")))
@ -146,6 +154,8 @@ ability to invoke the debugger in debug mode."
gc-cons-percentage 0.6
file-name-handler-alist nil))
(load (expand-file-name "early-init.el" doom-private-dir) t t)
(require 'core-packages (concat doom-core-dir "core-packages"))
(doom-initialize noninteractive)
(load! core-lib)
@ -156,12 +166,15 @@ ability to invoke the debugger in debug mode."
(load! core-projects) ; making Emacs project-aware
(load! core-keybinds)) ; centralized keybind system + which-key
(load (expand-file-name "init.el" doom-private-dir) t t)
(defun doom|after-init ()
"Run `doom-init-hook' and `doom-post-init-hook', start the Emacs server, and
display the loading benchmark."
(dolist (hook '(doom-init-hook doom-post-init-hook))
(run-hook-wrapped hook #'doom-try-run-hook hook))
(unless noninteractive
(load (expand-file-name "config.el" doom-private-dir) t t)
(when (display-graphic-p)
(require 'server)
(unless (server-running-p)