From e60d8f9cb1a5f29604ffcb327e0819297f56e513 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 25 May 2020 15:46:34 -0400 Subject: [PATCH] doom/install: refactor template insertion & module init --- core/cli/install.el | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/core/cli/install.el b/core/cli/install.el index ef4bc5614..9ea7b94bf 100644 --- a/core/cli/install.el +++ b/core/cli/install.el @@ -36,36 +36,20 @@ DOOMDIR environment variable. e.g. ;; Create init.el, config.el & packages.el (mapc (lambda (file) - (cl-destructuring-bind (filename . fn) file + (cl-destructuring-bind (filename . template) file (if (file-exists-p! filename doom-private-dir) (print! (warn "%s already exists, skipping") filename) (print! (info "Creating %s%s") (relpath doom-private-dir) filename) (with-temp-file (doom-path doom-private-dir filename) - (funcall fn)) + (insert-file-contents template)) (print! (success "Done!"))))) - '(("init.el" . - (lambda () - (insert-file-contents - (doom-path doom-emacs-dir "init.example.el")))) - ("config.el" . - (lambda () - (insert-file-contents - (doom-path doom-core-dir "templates/config.example.el")))) - ("packages.el" . - (lambda () - (insert-file-contents - (doom-path doom-core-dir "templates/packages.example.el"))))))) + `(("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"))))) ;; In case no init.el was present the first time `doom-initialize-modules' was ;; called in core.el (e.g. on first install) - (ignore-errors - (load! "init" doom-private-dir t)) - (when doom-modules - (maphash (lambda (key plist) - (let ((doom--current-module key) - (doom--current-flags (plist-get plist :flags))) - (ignore-errors (load! "init" (plist-get plist :path) t)))) - doom-modules)) + (doom-initialize-modules 'force 'no-config) ;; Ask if user would like an envvar file generated (if noenv-p