diff --git a/lisp/cli/ci.el b/lisp/cli/ci.el index b5757fa68..b0b515662 100644 --- a/lisp/cli/ci.el +++ b/lisp/cli/ci.el @@ -270,19 +270,18 @@ Note: warnings are not considered failures.") hooks-path)) (user-error "Aborted"))) (make-directory hooks-path 'parents) - (print-group! - (dolist (hook '("commit-msg" "pre-push")) - (let* ((hook (doom-path hooks-path hook)) - (overwrite-p (file-exists-p hook))) - (with-temp-file hook - (insert "#!/usr/bin/env sh\n" - (doom-path doom-emacs-dir "bin/doom") - " --no-color ci hook " (file-name-base hook) - " \"$@\"")) - (set-file-modes hook #o700) - (print! (success "%s %s") - (if overwrite-p "Overwrote" "Created") - (path hook))))))) + (dolist (hook '("commit-msg" "pre-push")) + (let* ((hook (doom-path hooks-path hook)) + (overwrite-p (file-exists-p hook))) + (with-temp-file hook + (insert "#!/usr/bin/env sh\n" + (doom-path doom-emacs-dir "bin/doom") + " --no-color ci hook " (file-name-base hook) + " \"$@\"")) + (set-file-modes hook #o700) + (print! (success "%s %s") + (if overwrite-p "Overwrote" "Created") + (path hook)))))) ;; TODO Move to 'doom lint commits' (defcli! (ci lint-commits) (from &optional to) diff --git a/lisp/cli/install.el b/lisp/cli/install.el index 8eaec4abe..3b737c3de 100644 --- a/lisp/cli/install.el +++ b/lisp/cli/install.el @@ -99,15 +99,15 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g. ;; Install Doom packages (if (eq install? :no) (print! (warn "Not installing plugins, as requested")) - (print! "Installing plugins") - (doom-packages-ensure)) + (print! (start "Installing plugins")) + (print-group! (doom-packages-ensure))) - (print! "Regenerating autoloads files") - (doom-profile-generate) + (print! (start "Synchronizing default profile...")) + (print-group! (doom-profile-generate)) (if (eq hooks? :no) (print! (warn "Not deploying commit-msg and pre-push git hooks, as requested")) - (print! "Deploying commit-msg and pre-push git hooks") + (print! (start "Deploying commit-msg and pre-push git hooks")) (print-group! (condition-case e (call! `(ci deploy-hooks ,@(if yes? '("--force")))) @@ -117,7 +117,7 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g. (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")) + (print! (success "Finished! Doom is ready to go!\n")) (with-temp-buffer (insert-file-contents (doom-path doom-emacs-dir "templates/QUICKSTART_INTRO")) (print! "%s" (buffer-string))))) diff --git a/templates/QUICKSTART_INTRO b/templates/QUICKSTART_INTRO index c909aba98..4c656d10e 100644 --- a/templates/QUICKSTART_INTRO +++ b/templates/QUICKSTART_INTRO @@ -1,19 +1,15 @@ But before you doom yourself, here are some things you should know: -1. Don't forget to run 'doom sync', then restart Emacs, after modifying init.el - or packages.el in ~/.config/doom. +1. Don't forget to run 'doom sync' and restart Emacs after modifying init.el or + packages.el in ~/.config/doom. This is never necessary for config.el. - This command ensures needed packages are installed, orphaned packages are - removed, and your autoloads/cache files are up to date. When in doubt, run - 'doom sync'! - -2. If something goes wrong, run `doom doctor`. It diagnoses common issues with - your environment and setup, and may offer clues about what is wrong. +2. If something goes wrong, run `doom doctor` to diagnose common issues with + your environment, setup, and config. 3. Use 'doom upgrade' to update Doom. Doing it any other way will require - additional steps. Run 'doom help upgrade' to understand those extra steps. + additional steps (see 'doom help upgrade'). 4. Access Doom's documentation from within Emacs via 'SPC h d h' or 'C-h d h' - (or 'M-x doom/help') + (or 'M-x doom/help'). Have fun!