doom refresh -> doom sync

refresh isn't going anywhere, but sync will be the canonical command
here on out, because it is more appropriate for kind of work it will be
doing in the future.
This commit is contained in:
Henrik Lissner 2020-02-19 23:34:16 -05:00
parent f29d5ed034
commit 8a7763337d
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
9 changed files with 16 additions and 16 deletions

View file

@ -125,7 +125,7 @@ We have [a Discord server][url:discord]! Hop on and say hi!
Encountered strange behavior or an error? Here are some things to try before you Encountered strange behavior or an error? Here are some things to try before you
shoot off that bug report: shoot off that bug report:
- Run `bin/doom refresh`. This ensures Doom is properly set up and its autoloads - Run `bin/doom sync`. This ensures Doom is properly set up and its autoloads
files are up-to-date. files are up-to-date.
- If you have byte-compiled your config (with `bin/doom compile`), see if - If you have byte-compiled your config (with `bin/doom compile`), see if
`bin/doom clean` makes the issue go away. Never debug issues with a `bin/doom clean` makes the issue go away. Never debug issues with a

View file

@ -68,16 +68,16 @@ And jumps to your `doom!' block."
(defun doom/reload () (defun doom/reload ()
"Reloads your private config. "Reloads your private config.
This is experimental! It will try to do as `bin/doom refresh' does, but from This is experimental! It will try to do as `bin/doom sync' does, but from within
within this Emacs session. i.e. it reload autoloads files (if necessary), this Emacs session. i.e. it reload autoloads files (if necessary), reloads your
reloads your package list, and lastly, reloads your private config.el. package list, and lastly, reloads your private config.el.
Runs `doom-reload-hook' afterwards." Runs `doom-reload-hook' afterwards."
(interactive) (interactive)
(require 'core-cli) (require 'core-cli)
(when (and IS-WINDOWS (file-exists-p doom-env-file)) (when (and IS-WINDOWS (file-exists-p doom-env-file))
(warn "Can't regenerate envvar file from within Emacs. Run 'doom env' from the console")) (warn "Can't regenerate envvar file from within Emacs. Run 'doom env' from the console"))
(doom--compile (format "%s refresh -e" doom-bin) (doom--compile (format "%s sync -e" doom-bin)
:on-success :on-success
(let ((doom-reloading-p t)) (let ((doom-reloading-p t))
(doom-initialize 'force) (doom-initialize 'force)
@ -99,7 +99,7 @@ This is much faster and safer than `doom/reload', but not as comprehensive. This
reloads your package and module visibility, but does not install new packages or reloads your package and module visibility, but does not install new packages or
remove orphaned ones. It also doesn't reload your private config. remove orphaned ones. It also doesn't reload your private config.
It is useful to only pull in changes performed by 'doom refresh' on the command It is useful to only pull in changes performed by 'doom sync' on the command
line." line."
(interactive) (interactive)
(require 'core-cli) (require 'core-cli)

View file

@ -19,8 +19,8 @@ This is useful in cases where you cannot guarantee that Emacs (or the daemon)
will be launched from the correct environment (e.g. on MacOS or through certain will be launched from the correct environment (e.g. on MacOS or through certain
app launchers on Linux). app launchers on Linux).
This file is automatically regenerated when you run this command or 'doom This file is automatically regenerated when you run this command or 'doom sync'.
refresh'. However, 'doom refresh' will only regenerate this file if it exists. However, 'doom sync' will only regenerate this file if it exists.
Why this over exec-path-from-shell? Why this over exec-path-from-shell?
@ -111,7 +111,7 @@ default, on Linux, this is '$SHELL -ic /usr/bin/env'. Variables in
"#\n" "#\n"
(if (file-equal-p env-file doom-env-file) (if (file-equal-p env-file doom-env-file)
(concat "# It is NOT safe to edit this file. Changes will be overwritten next time you\n" (concat "# It is NOT safe to edit this file. Changes will be overwritten next time you\n"
"# run 'doom refresh'. To create a safe-to-edit envvar file use:\n#\n" "# run 'doom sync'. To create a safe-to-edit envvar file use:\n#\n"
"# doom env -o ~/.doom.d/myenv\n#\n" "# doom env -o ~/.doom.d/myenv\n#\n"
"# And load it with (doom-load-envvars-file \"~/.doom.d/myenv\").\n") "# And load it with (doom-load-envvars-file \"~/.doom.d/myenv\").\n")
(concat "# This file is safe to edit by hand, but needs to be loaded manually with:\n#\n" (concat "# This file is safe to edit by hand, but needs to be loaded manually with:\n#\n"

View file

@ -11,7 +11,7 @@ following shell commands:
cd ~/.emacs.d cd ~/.emacs.d
git pull --rebase git pull --rebase
bin/doom clean bin/doom clean
bin/doom refresh bin/doom sync
bin/doom update" bin/doom update"
:bare t :bare t
(let ((doom-auto-discard force-p)) (let ((doom-auto-discard force-p))

View file

@ -21,7 +21,7 @@
;; ;;
;; + `bin/doom install`: a wizard that guides you through setting up Doom and ;; + `bin/doom install`: a wizard that guides you through setting up Doom and
;; your private config for the first time. ;; your private config for the first time.
;; + `bin/doom refresh`: your go-to command for making sure Doom is in optimal ;; + `bin/doom sync`: your go-to command for making sure Doom is in optimal
;; condition. It ensures all unneeded packages are removed, all needed ones ;; condition. It ensures all unneeded packages are removed, all needed ones
;; are installed, and all metadata associated with them is generated. ;; are installed, and all metadata associated with them is generated.
;; + `bin/doom upgrade`: upgrades Doom Emacs and your packages to the latest ;; + `bin/doom upgrade`: upgrades Doom Emacs and your packages to the latest

View file

@ -115,7 +115,7 @@ This file is compiled from the autoloads files of all installed packages
combined.") combined.")
(defconst doom-env-file (concat doom-local-dir "env") (defconst doom-env-file (concat doom-local-dir "env")
"The location of your envvar file, generated by `doom env refresh`. "The location of your envvar file, generated by `doom env`.
This file contains environment variables scraped from your shell environment, This file contains environment variables scraped from your shell environment,
which is loaded at startup (if it exists). This is helpful if Emacs can't which is loaded at startup (if it exists). This is helpful if Emacs can't

View file

@ -15,7 +15,7 @@ Before you doom yourself, there are a few things you should know:
give you clues about what is wrong. give you clues about what is wrong.
3. Use `bin/doom upgrade` to update Doom. Doing it any other way may require 3. Use `bin/doom upgrade` to update Doom. Doing it any other way may require
additional work. When in doubt, run `bin/doom refresh`. additional work. When in doubt, run `bin/doom sync`.
4. Check out `bin/doom help` to see what else `bin/doom` can do (and it is 4. Check out `bin/doom help` to see what else `bin/doom` can do (and it is
recommended you add ~/.emacs.d/bin to your PATH). recommended you add ~/.emacs.d/bin to your PATH).

View file

@ -137,7 +137,7 @@ And these are text objects added by this module:
You must do two things to remove Evil: You must do two things to remove Evil:
1. Remove =:editor evil= from =~/.doom.d/init.el=, 1. Remove =:editor evil= from =~/.doom.d/init.el=,
2. Run ~doom refresh~ to clean up lingering dependencies and refresh your 2. Run ~doom sync~ to clean up lingering dependencies and regenerate your
autoloads files. autoloads files.
3. [OPTIONAL] You may want to assign new values to ~doom-leader-alt-key~ and 3. [OPTIONAL] You may want to assign new values to ~doom-leader-alt-key~ and
~doom-localleader-alt-key~. These are bound to =C-c= and =C-c l= by default. ~doom-localleader-alt-key~. These are bound to =C-c= and =C-c l= by default.

View file

@ -69,8 +69,8 @@ opam install merlin utop ocp-indent dune ocamlformat
+ If =:emacs imenu= is enabled then top level symbols (modules, type, functions, + If =:emacs imenu= is enabled then top level symbols (modules, type, functions,
etc.) can be looked up using =SPC / i= etc.) can be looked up using =SPC / i=
Run =bin/doom refresh= to install all packages and =make doctor= to diagnose Run =doom sync= to install all packages and =doom doctor= to diagnose missing
missing tools. tools.
* Appendix * Appendix
** Commands ** Commands