mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-01 12:17:25 -05:00
9687c04a84
Half-revertsc2c6a64, which tried to get doom/reload to regenerate the envvar file from within Emacs, but running an environment scraper in a bare environment is really hard to get right. Ideally, your shell config should set up your environment, but there are too many edge cases or poor configs in the wild to depend on this. I've brought back doom/reload-env, but only to reload the envvar file -- *not* regenerate it. I've given up on trying to do that from within Emacs. Fix #5344 Refc2c6a64118
128 lines
3.9 KiB
EmacsLisp
128 lines
3.9 KiB
EmacsLisp
;;; core/autoload/config.el -*- lexical-binding: t; -*-
|
|
|
|
(defvar doom-bin-dir (concat doom-emacs-dir "bin/"))
|
|
(defvar doom-bin (concat doom-bin-dir "doom"))
|
|
|
|
;;;###autoload
|
|
(defvar doom-reloading-p nil
|
|
"TODO")
|
|
|
|
;;;###autoload
|
|
(defun doom/open-private-config ()
|
|
"Browse your `doom-private-dir'."
|
|
(interactive)
|
|
(unless (file-directory-p doom-private-dir)
|
|
(make-directory doom-private-dir t))
|
|
(doom-project-browse doom-private-dir))
|
|
|
|
;;;###autoload
|
|
(defun doom/find-file-in-private-config ()
|
|
"Search for a file in `doom-private-dir'."
|
|
(interactive)
|
|
(doom-project-find-file doom-private-dir))
|
|
|
|
;;;###autoload
|
|
(defun doom/goto-private-init-file ()
|
|
"Open your private init.el file.
|
|
And jumps to your `doom!' block."
|
|
(interactive)
|
|
(find-file (expand-file-name "init.el" doom-private-dir))
|
|
(goto-char
|
|
(or (save-excursion
|
|
(goto-char (point-min))
|
|
(search-forward "(doom!" nil t))
|
|
(point))))
|
|
|
|
;;;###autoload
|
|
(defun doom/goto-private-config-file ()
|
|
"Open your private config.el file."
|
|
(interactive)
|
|
(find-file (expand-file-name "config.el" doom-private-dir)))
|
|
|
|
;;;###autoload
|
|
(defun doom/goto-private-packages-file ()
|
|
"Open your private packages.el file."
|
|
(interactive)
|
|
(find-file (expand-file-name "packages.el" doom-private-dir)))
|
|
|
|
|
|
;;
|
|
;;; Managements
|
|
|
|
(defmacro doom--if-compile (command on-success &optional on-failure)
|
|
(declare (indent 2))
|
|
`(with-current-buffer (compile ,command t)
|
|
(let ((w (get-buffer-window (current-buffer))))
|
|
(select-window w)
|
|
(add-hook
|
|
'compilation-finish-functions
|
|
(lambda (_buf status)
|
|
(if (equal status "finished\n")
|
|
(progn
|
|
(delete-window w)
|
|
,on-success)
|
|
,on-failure))
|
|
nil 'local))))
|
|
|
|
;;;###autoload
|
|
(defun doom/reload ()
|
|
"Reloads your private config.
|
|
|
|
This is experimental! It will try to do as `bin/doom sync' does, but from within
|
|
this Emacs session. i.e. it reload autoloads files (if necessary), reloads your
|
|
package list, and lastly, reloads your private config.el.
|
|
|
|
Runs `doom-after-reload-hook' afterwards."
|
|
(interactive)
|
|
(mapc #'require (cdr doom-incremental-packages))
|
|
(doom--if-compile (format "%S sync" doom-bin)
|
|
(let ((doom-reloading-p t)
|
|
doom-env-file)
|
|
(doom-run-hooks 'doom-before-reload-hook)
|
|
(doom-initialize 'force)
|
|
(with-demoted-errors "PRIVATE CONFIG ERROR: %s"
|
|
(general-auto-unbind-keys)
|
|
(unwind-protect
|
|
(doom-initialize-modules 'force)
|
|
(general-auto-unbind-keys t)))
|
|
(doom-run-hooks 'doom-after-reload-hook)
|
|
(message "Config successfully reloaded!"))
|
|
(user-error "Failed to reload your config")))
|
|
|
|
;;;###autoload
|
|
(defun doom/reload-autoloads ()
|
|
"Reload only `doom-autoloads-file' and `doom-package-autoload-file'.
|
|
|
|
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
|
|
remove orphaned ones. It also doesn't reload your private config.
|
|
|
|
It is useful to only pull in changes performed by 'doom sync' on the command
|
|
line."
|
|
(interactive)
|
|
(require 'core-cli)
|
|
(require 'core-packages)
|
|
(doom-initialize-packages)
|
|
(doom-autoloads-reload))
|
|
|
|
;;;###autoload
|
|
(defun doom/reload-env ()
|
|
"Reloads your envvar file.
|
|
|
|
DOES NOT REGENERATE IT. You must run 'doom env' in your shell OUTSIDE of Emacs.
|
|
Doing so from within Emacs will taint your shell environment.
|
|
|
|
An envvar file contains a snapshot of your shell environment, which can be
|
|
imported into Emacs."
|
|
(interactive "P")
|
|
(doom-load-envvars-file doom-env-file)
|
|
(message "Reloaded %S" (abbreviate-file-name doom-env-file)))
|
|
|
|
;;;###autoload
|
|
(defun doom/upgrade ()
|
|
"Run 'doom upgrade' then prompt to restart Emacs."
|
|
(interactive)
|
|
(doom--if-compile (format "%S -y upgrade" doom-bin)
|
|
(when (y-or-n-p "You must restart Emacs for the upgrade to take effect.\n\nRestart Emacs?")
|
|
(doom/restart-and-restore))))
|