emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev: merge branch 'master' of github.com:doomemacs

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-09-05 11:31:00 -04:00
commit 7aaa532d27
11 changed files with 195 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lisp/cli/ci.el
View file

@ -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)

19
lisp/cli/install.el
View file

@ -81,8 +81,9 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g.
. ,(file-name-with-extension (doom-path template-dir doom-module-packages-file)
".example.el")))))))
;; In case no init.el was present the first time it was loaded.
;; In case no init.el (or cli.el) was present before the config was deployed
(doom-load (doom-path doom-user-dir doom-module-init-file) t)
(doom-load (doom-path doom-user-dir "cli.el") t)
;; Ask if user would like an envvar file generated
(if (eq envfile? :no)
@ -99,15 +100,19 @@ 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)
(when (doom-profiles-bootloadable-p)
(print! (start "Initializing profile bootstrapper..."))
(call! '(profiles sync "--reload")))
(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 +122,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)))))