0e851ace9b
The rewrite for Doom's CLI is taking a while, so I've backported a few important changes in order to ease the transition and fix a couple bugs sooner. Fixes #2802, #2737, #2386 The big highlights are: - Fix #2802: We now update recipe repos *before* updating/installing any new packages. No more "Could not find package X in recipe repositories". - Fix #2737: An edge case where straight couldn't reach a pinned commit (particularly with agda). - Doom is now smarter about what option it recommends when straight prompts you to make a choice. - Introduces a new init path for Doom. The old way: - Launch in "minimal" CLI mode in non-interactive sessions - Launch a "full" interactive mode otherwise. The new way - Launch in "minimal" CLI mode *only* for bin/doom - Launch is a simple mode for non-interactive sessions that still need access to your interactive config (like async org export/babel). - Launch a "full" interactive mode otherwise. This should fix compatibility issues with plugins that use the async.el library or spawn child Emacs processes to fake parallelization (like org's async export and babel functionality). - Your private init.el is now loaded more reliably when running any bin/doom command. This gives you an opportunity to configure its settings. - Added doom-first-{input,buffer,file}-hook hooks, which we use to queue deferred activation of a number of packages. Users can remove these modes from these hooks; altogether preventing them from loading, rather than waiting for them to load to then disable them, e.g. (after! smartparens (smartparens-global-mode -1)) -> (remove-hook 'doom-first-buffer #'smartparens-global-mode) Hooks added to doom-first-*-hook variables will be removed once they run. This should also indirectly fix #2386, by preventing interactive modes from running in non-interactive session. - Added `doom/bump-*` commands to make bumping modules and packages easier, and `doom/bumpify-*` commands for converting package! statements into user/repo@sha1hash format for bump commits. - straight.el is now commit-pinned, like all other packages. We also more reliably install straight.el by cloning it ourselves, rather than relying on its bootstrap.el. This should prevent infinite "straight has diverged from master" prompts whenever we change branches (though, you might have to put up with it one more after this update -- see #2937 for workaround). All the other minor changes: - Moved core/autoload/cli.el to core/autoload/process.el - The package manager will log attempts to check out pinned commits - If package state is incomplete while rebuilding packages, emit a simpler error message instead of an obscure one! - Added -u switch to 'doom sync' to make it run 'doom update' afterwards - Added -p switch to 'doom sync' to make it run 'doom purge' afterwards - Replace doom-modules function with doom-modules-list - The `with-plist!` macro was removed, since `cl-destructuring-bind` already serves that purpose well enough. - core/autoload/packages.el was moved into core-packages.el - bin/doom will no longer die if DOOMDIR or DOOMLOCALDIR don't have a trailing slash - Introduces doom-debug-variables; a list of variables to toggle on doom/toggle-debug-mode. - The sandbox has been updated to reflect the above changes, also: 1. Child instances will no longer inherit the process environment of the host instance, 2. It will no longer produce an auto-save-list directory in ~/.emacs.d
144 lines
4.6 KiB
EmacsLisp
144 lines
4.6 KiB
EmacsLisp
;;; core/autoload/sessions.el -*- lexical-binding: t; -*-
|
|
|
|
(defvar desktop-base-file-name)
|
|
(defvar desktop-dirname)
|
|
(defvar desktop-restore-eager)
|
|
(defvar desktop-file-modtime)
|
|
|
|
|
|
;;
|
|
;;; Helpers
|
|
|
|
;;;###autoload
|
|
(defun doom-session-file (&optional name)
|
|
"TODO"
|
|
(cond ((require 'persp-mode nil t)
|
|
(expand-file-name (or name persp-auto-save-fname) persp-save-dir))
|
|
((require 'desktop nil t)
|
|
(if name
|
|
(expand-file-name name (file-name-directory (desktop-full-file-name)))
|
|
(desktop-full-file-name)))
|
|
((error "No session backend available"))))
|
|
|
|
;;;###autoload
|
|
(defun doom-save-session (&optional file)
|
|
"TODO"
|
|
(setq file (expand-file-name (or file (doom-session-file))))
|
|
(cond ((require 'persp-mode nil t)
|
|
(unless persp-mode (persp-mode +1))
|
|
(setq persp-auto-save-opt 0)
|
|
(persp-save-state-to-file file))
|
|
((and (require 'frameset nil t)
|
|
(require 'restart-emacs nil t))
|
|
(let ((frameset-filter-alist (append '((client . restart-emacs--record-tty-file))
|
|
frameset-filter-alist))
|
|
(desktop-base-file-name (file-name-nondirectory file))
|
|
(desktop-dirname (file-name-directory file))
|
|
(desktop-restore-eager t)
|
|
desktop-file-modtime)
|
|
(make-directory desktop-dirname t)
|
|
;; Prevents confirmation prompts
|
|
(let ((desktop-file-modtime (nth 5 (file-attributes (desktop-full-file-name)))))
|
|
(desktop-save desktop-dirname t))))
|
|
((error "No session backend to save session with"))))
|
|
|
|
;;;###autoload
|
|
(defun doom-load-session (&optional file)
|
|
"TODO"
|
|
(setq file (expand-file-name (or file (doom-session-file))))
|
|
(message "Attempting to load %s" file)
|
|
(cond ((not (file-readable-p file))
|
|
(message "No session file at %S to read from" file))
|
|
((require 'persp-mode nil t)
|
|
(unless persp-mode
|
|
(persp-mode +1))
|
|
(let ((allowed (persp-list-persp-names-in-file file)))
|
|
(cl-loop for name being the hash-keys of *persp-hash*
|
|
unless (member name allowed)
|
|
do (persp-kill name))
|
|
(persp-load-state-from-file file)))
|
|
((and (require 'frameset nil t)
|
|
(require 'restart-emacs nil t))
|
|
(restart-emacs--restore-frames-using-desktop file))
|
|
((error "No session backend to load session with"))))
|
|
|
|
|
|
;;
|
|
;;; Command line switch
|
|
|
|
;;;###autoload
|
|
(defun doom-restore-session-handler (&rest _)
|
|
"TODO"
|
|
(add-hook 'window-setup-hook #'doom-load-session 'append))
|
|
|
|
;;;###autoload
|
|
(add-to-list 'command-switch-alist (cons "--restore" #'doom-restore-session-handler))
|
|
|
|
|
|
;;
|
|
;;; Commands
|
|
|
|
;;;###autoload
|
|
(defun doom/quickload-session ()
|
|
"TODO"
|
|
(interactive)
|
|
(message "Restoring session...")
|
|
(doom-load-session)
|
|
(message "Session restored. Welcome back."))
|
|
|
|
;;;###autoload
|
|
(defun doom/quicksave-session ()
|
|
"TODO"
|
|
(interactive)
|
|
(message "Saving session")
|
|
(doom-save-session)
|
|
(message "Saving session...DONE"))
|
|
|
|
;;;###autoload
|
|
(defun doom/load-session (file)
|
|
"TODO"
|
|
(interactive
|
|
(let ((session-file (doom-session-file)))
|
|
(list (or (read-file-name "Session to restore: "
|
|
(file-name-directory session-file)
|
|
(file-name-nondirectory session-file)
|
|
t)
|
|
(user-error "No session selected. Aborting")))))
|
|
(unless file
|
|
(error "No session file selected"))
|
|
(message "Loading '%s' session" file)
|
|
(doom-load-session file)
|
|
(message "Session restored. Welcome back."))
|
|
|
|
;;;###autoload
|
|
(defun doom/save-session (file)
|
|
"TODO"
|
|
(interactive
|
|
(let ((session-file (doom-session-file)))
|
|
(list (or (read-file-name "Save session to: "
|
|
(file-name-directory session-file)
|
|
(file-name-nondirectory session-file))
|
|
(user-error "No session selected. Aborting")))))
|
|
(unless file
|
|
(error "No session file selected"))
|
|
(message "Saving '%s' session" file)
|
|
(doom-save-session file))
|
|
|
|
;;;###autoload
|
|
(defalias 'doom/restart #'restart-emacs)
|
|
|
|
;;;###autoload
|
|
(defun doom/restart-and-restore (&optional debug)
|
|
"TODO"
|
|
(interactive "P")
|
|
(setq doom-autosave-session nil)
|
|
(doom/quicksave-session)
|
|
(save-some-buffers nil t)
|
|
(letf! ((#'save-buffers-kill-emacs #'kill-emacs)
|
|
(confirm-kill-emacs))
|
|
(restart-emacs
|
|
(append (if debug (list "--debug-init"))
|
|
(when (boundp 'chemacs-current-emacs-profile)
|
|
(list "--with-profile" chemacs-current-emacs-profile))
|
|
(list "--restore")))))
|