Updating Doom Emacs.

.emacs.d/core/cli/install.el

@@ -4,8 +4,7 @@
     ((noconfig-p  ["--no-config"]  "Don't create DOOMDIR or dummy files therein")
      (noenv-p     ["--no-env"]     "Don't generate an envvars file (see 'doom help env')")
      (noinstall-p ["--no-install"] "Don't auto-install packages")
-     (nofonts-p   ["--no-fonts"]   "Don't install (or prompt to install) all-the-icons fonts")
-     &rest _args)
+     (nofonts-p   ["--no-fonts"]   "Don't install (or prompt to install) all-the-icons fonts"))
   "Installs and sets up Doom Emacs for the first time.
 
 This command does the following:
@@ -24,7 +23,6 @@ DOOMDIR environment variable. e.g.
 
   doom -p ~/.config/doom install
   DOOMDIR=~/.config/doom doom install"
-  :bare t
   (print! (green "Installing Doom Emacs!\n"))
   (let ((default-directory (doom-path "~")))
     ;; Create `doom-private-dir'
@@ -37,34 +35,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! ";;; %sconfig.el -*- lexical-binding: t; -*-\n\n"
-                          ";; Place your private configuration here\n"
-                          ((relpath doom-private-dir)))))
-              ("packages.el" .
-               (lambda ()
-                 (insert! ";; -*- no-byte-compile: t; -*-\n;;; %spackages.el\n\n"
-                          ";;; Examples:\n"
-                          ";; (package! some-package)\n"
-                          ";; (package! another-package :recipe (:host github :repo \"username/repo\"))\n"
-                          ";; (package! builtin-package :disable t)\n"
-                          ((relpath doom-private-dir))))))))
+            `(("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)
-    (doom-initialize 'force 'noerror)
-    (doom-initialize-modules)
+    (doom-initialize-modules 'force 'no-config)
 
     ;; Ask if user would like an envvar file generated
     (if noenv-p
@@ -72,7 +56,7 @@ DOOMDIR environment variable. e.g.
       (if (file-exists-p doom-env-file)
           (print! (info "Envvar file already exists, skipping"))
         (when (or doom-auto-accept
-                  (y-or-n-p "Generate an env file? (see `doom help env` for details)"))
+                  (y-or-n-p "Generate an envvar file? (see `doom help env` for details)"))
           (doom-cli-reload-env-file 'force-p))))
 
     ;; Install Doom packages
@@ -82,21 +66,29 @@ DOOMDIR environment variable. e.g.
       (doom-cli-packages-install))
 
     (print! "Regenerating autoloads files")
-    (doom-cli-reload-autoloads nil 'force-p)
+    (doom-autoloads-reload)
 
-    (if nofonts-p
-        (print! (warn "Not installing fonts, as requested"))
-      (when (or doom-auto-accept
-                (y-or-n-p "Download and install all-the-icon's fonts?"))
-        (require 'all-the-icons)
-        (let ((window-system (cond (IS-MAC 'ns)
-                                   (IS-LINUX 'x))))
-          (all-the-icons-install-fonts 'yes))))
+    (cond (nofonts-p)
+          (IS-WINDOWS
+           (print! (warn "Doom cannot install all-the-icons' fonts on Windows!\n"))
+           (print-group!
+            (print!
+             (concat "You'll have to do so manually:\n\n"
+                     "  1. Launch Doom Emacs\n"
+                     "  2. Execute 'M-x all-the-icons-install-fonts' to download the fonts\n"
+                     "  3. Open the download location in windows explorer\n"
+                     "  4. Open each font file to install them"))))
+          ((or doom-auto-accept
+               (y-or-n-p "Download and install all-the-icon's fonts?"))
+           (require 'all-the-icons)
+           (let ((window-system (cond (IS-MAC 'ns)
+                                      (IS-LINUX 'x))))
+             (all-the-icons-install-fonts 'yes))))
 
     (when (file-exists-p "~/.emacs")
       (print! (warn "A ~/.emacs file was detected. This conflicts with Doom and should be deleted!")))
 
     (print! (success "\nFinished! Doom is ready to go!\n"))
     (with-temp-buffer
-      (doom-template-insert "QUICKSTART_INTRO")
-      (print! (buffer-string)))))
+      (insert-file-contents (doom-glob doom-core-dir "templates/QUICKSTART_INTRO"))
+      (print! "%s" (buffer-string)))))