diff --git a/core/autoload/cli.el b/core/autoload/cli.el index 5ab0f66d0..5f2c371f5 100644 --- a/core/autoload/cli.el +++ b/core/autoload/cli.el @@ -43,24 +43,3 @@ "TODO" (interactive "P") (doom--run "refresh" yes)) - -;;;###autoload -(defun doom/reload (&optional force-p) - "Reloads your config. This is experimental! - -If called from a noninteractive session, this will try to communicate with a -live server (if one is found) to tell it to run this function. - -If called from an interactive session, tries to reload autoloads files (if -necessary), reinistalize doom (via `doom-initialize') and reloads your private -init.el and config.el. Then runs `doom-reload-hook'." - (interactive "P") - (require 'core-cli) - (doom-reload-autoloads force-p) - (setq load-path doom-site-load-path) - (let (doom-init-p) - (doom-initialize)) - (with-demoted-errors "PRIVATE CONFIG ERROR: %s" - (doom-initialize-modules 'force)) - (run-hook-wrapped 'doom-reload-hook #'doom-try-run-hook) - (message "Finished!")) diff --git a/core/autoload/config.el b/core/autoload/config.el new file mode 100644 index 000000000..7d3a16604 --- /dev/null +++ b/core/autoload/config.el @@ -0,0 +1,36 @@ +;;; core/autoload/config.el -*- lexical-binding: t; -*- + +;;;###autoload +(defun doom/open-private-config () + "TODO" + (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 () + "TODO" + (interactive) + (doom-project-find-file doom-private-dir)) + +;;;###autoload +(defun doom/reload (&optional force-p) + "Reloads your config. This is experimental! + +If called from a noninteractive session, this will try to communicate with a +live server (if one is found) to tell it to run this function. + +If called from an interactive session, tries to reload autoloads files (if +necessary), reinistalize doom (via `doom-initialize') and reloads your private +init.el and config.el. Then runs `doom-reload-hook'." + (interactive "P") + (require 'core-cli) + (doom-reload-autoloads force-p) + (setq load-path doom-site-load-path) + (let (doom-init-p) + (doom-initialize)) + (with-demoted-errors "PRIVATE CONFIG ERROR: %s" + (doom-initialize-modules 'force)) + (run-hook-wrapped 'doom-reload-hook #'doom-try-run-hook) + (message "Finished!")) diff --git a/core/autoload/editor.el b/core/autoload/text.el similarity index 86% rename from core/autoload/editor.el rename to core/autoload/text.el index 527c28384..51486d559 100644 --- a/core/autoload/editor.el +++ b/core/autoload/text.el @@ -1,4 +1,4 @@ -;;; core/autoload/editor.el -*- lexical-binding: t; -*- +;;; core/autoload/text.el -*- lexical-binding: t; -*- ;;;###autoload (defun doom-surrounded-p (pair &optional inline balanced) @@ -132,30 +132,6 @@ opposite indentation style." (tabify beg end) (untabify beg end)))) -(defvar-local doom--buffer-narrowed-origin nil) -;;;###autoload -(defun doom/clone-and-narrow-buffer (beg end &optional clone-p) - "Restrict editing in this buffer to the current region, indirectly. With CLONE-P, -clone the buffer and hard-narrow the selection. If mark isn't active, then widen -the buffer (if narrowed). - -Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" - (interactive "rP") - (cond ((or (region-active-p) - (and beg end)) - (deactivate-mark) - (when clone-p - (let ((old-buf (current-buffer))) - (switch-to-buffer (clone-indirect-buffer nil nil)) - (setq doom--buffer-narrowed-origin old-buf))) - (narrow-to-region beg end)) - (doom--buffer-narrowed-origin - (kill-this-buffer) - (switch-to-buffer doom--buffer-narrowed-origin) - (setq doom--buffer-narrowed-origin nil)) - (t - (widen)))) - ;;;###autoload (defun doom/delete-trailing-newlines () "Trim trailing newlines. diff --git a/core/autoload/ui.el b/core/autoload/ui.el index 28ac10180..f163e8019 100644 --- a/core/autoload/ui.el +++ b/core/autoload/ui.el @@ -163,6 +163,30 @@ OPACITY is an integer between 0 to 100, inclusive." 100)))) (set-frame-parameter nil 'alpha opacity)) +(defvar-local doom--buffer-narrowed-origin nil) +;;;###autoload +(defun doom/clone-and-narrow-buffer (beg end &optional clone-p) + "Restrict editing in this buffer to the current region, indirectly. With CLONE-P, +clone the buffer and hard-narrow the selection. If mark isn't active, then widen +the buffer (if narrowed). + +Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/" + (interactive "rP") + (cond ((or (region-active-p) + (and beg end)) + (deactivate-mark) + (when clone-p + (let ((old-buf (current-buffer))) + (switch-to-buffer (clone-indirect-buffer nil nil)) + (setq doom--buffer-narrowed-origin old-buf))) + (narrow-to-region beg end)) + (doom--buffer-narrowed-origin + (kill-this-buffer) + (switch-to-buffer doom--buffer-narrowed-origin) + (setq doom--buffer-narrowed-origin nil)) + (t + (widen)))) + ;; ;; Modes diff --git a/core/core-editor.el b/core/core-editor.el index 189ca880b..740281c20 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -21,7 +21,7 @@ successfully sets indent_style/indent_size.") detected.") (setq-default - large-file-warning-threshold 30000000 + large-file-warning-threshold 15000000 vc-follow-symlinks t ;; Save clipboard contents into kill-ring before replacing them save-interprogram-paste-before-kill t @@ -52,23 +52,14 @@ detected.") ;; Remove hscroll-margin in shells, otherwise it causes jumpiness (setq-hook! '(eshell-mode-hook term-mode-hook) hscroll-margin 0) -(defun doom|check-large-file () - "Check if the buffer's file is large (see `doom-large-file-size'). If so, ask -for confirmation to open it literally (read-only, disabled undo and in -fundamental-mode) for performance sake." - (when (and (not (memq major-mode doom-large-file-modes-list)) - auto-mode-alist - (get-buffer-window)) - (when-let* ((size (nth 7 (file-attributes buffer-file-name)))) - (when (and (> size (* 1024 1024 doom-large-file-size)) - (y-or-n-p - (format (concat "%s is a large file, open literally to " - "avoid performance issues?") - (file-relative-name buffer-file-name)))) - (setq buffer-read-only t) - (buffer-disable-undo) - (fundamental-mode))))) -(add-hook 'find-file-hook #'doom|check-large-file) +(defun doom*optimize-literal-mode-for-large-files (buffer) + "TODO" + (with-current-buffer buffer + (when find-file-literally + (setq buffer-read-only t) + (buffer-disable-undo)) + buffer)) +(advice-add #'find-file-noselect-1 :filter-return #'doom*optimize-literal-mode-for-large-files) ;; @@ -290,11 +281,13 @@ savehist file." ;; `helpful' --- a better *help* buffer -(let ((map (current-global-map))) - (define-key map [remap describe-function] #'helpful-callable) - (define-key map [remap describe-command] #'helpful-command) - (define-key map [remap describe-variable] #'helpful-variable) - (define-key map [remap describe-key] #'helpful-key)) +(def-package! helpful + :defer t + :init + (global-set-key [remap describe-function] #'helpful-callable) + (global-set-key [remap describe-command] #'helpful-command) + (global-set-key [remap describe-variable] #'helpful-variable) + (global-set-key [remap describe-key] #'helpful-key)) (def-package! ws-butler diff --git a/core/core-projects.el b/core/core-projects.el index 3e2059379..ab2303507 100644 --- a/core/core-projects.el +++ b/core/core-projects.el @@ -1,7 +1,7 @@ ;;; core-projects.el -*- lexical-binding: t; -*- (def-package! projectile - :after-call (pre-command-hook after-find-file dired-before-readin-hook) + :after-call (after-find-file dired-before-readin-hook) :commands (projectile-project-root projectile-project-name projectile-project-p) :init (setq projectile-cache-file (concat doom-cache-dir "projectile.cache") @@ -94,9 +94,9 @@ state are passed in.") on-exit) "Define a project minor-mode named NAME (a symbol) and declare where and how it is activated. Project modes allow you to configure 'sub-modes' for -major-modes that are specific to a specific folder, certain project structure, -framework or arbitrary context you define. These project modes can have their -own settings, keymaps, hooks, snippets, etc. +major-modes that are specific to a folder, project structure, framework or +whatever arbitrary context you define. These project modes can have their own +settings, keymaps, hooks, snippets, etc. This creates NAME-hook and NAME-map as well. diff --git a/core/core-ui.el b/core/core-ui.el index 6b35fea02..1c8924ab2 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -1,9 +1,12 @@ ;;; core-ui.el -*- lexical-binding: t; -*- +;; +;;; Variables + (defvar doom-theme nil "A symbol representing the Emacs theme to load at startup. -This is changed when `load-theme' is used as well.") +This is changed by `load-theme'.") (defvar doom-font nil "The default font to use. @@ -50,9 +53,122 @@ size.") ;; +;;; Custom hooks + (defvar doom-init-ui-hook nil "List of hooks to run when the UI has been initialized.") +(defvar doom-load-theme-hook nil + "Hook run after the theme is loaded with `load-theme' or reloaded with +`doom/reload-theme'.") + +(defvar doom-exit-window-hook nil + "Hook run before `switch-window' or `switch-frame' are called. + +Also see `doom-enter-window-hook'.") + +(defvar doom-enter-window-hook nil + "Hook run after `switch-window' or `switch-frame' are called. + +Also see `doom-exit-window-hook'.") + +(defvar doom-exit-buffer-hook nil + "Hook run after `switch-to-buffer', `pop-to-buffer' or `display-buffer' are +called. The buffer to be switched to is current when these hooks run. + +Also see `doom-enter-buffer-hook'.") + +(defvar doom-enter-buffer-hook nil + "Hook run before `switch-to-buffer', `pop-to-buffer' or `display-buffer' are +called. The buffer to be switched to is current when these hooks run. + +Also see `doom-exit-buffer-hook'.") + +(defvar doom-inhibit-switch-buffer-hooks nil + "Letvar for inhibiting `doom-enter-buffer-hook' and `doom-exit-buffer-hook'. +Do not set this directly.") +(defvar doom-inhibit-switch-window-hooks nil + "Letvar for inhibiting `doom-enter-window-hook' and `doom-exit-window-hook'. +Do not set this directly.") + +(defun doom*switch-window-hooks (orig-fn window &optional norecord) + (if (or doom-inhibit-switch-window-hooks + (null window) + (eq window (selected-window)) + (window-minibuffer-p) + (window-minibuffer-p window)) + (funcall orig-fn window norecord) + (let ((doom-inhibit-switch-window-hooks t)) + (run-hooks 'doom-exit-window-hook) + (prog1 (funcall orig-fn window norecord) + (with-selected-window window + (run-hooks 'doom-enter-window-hook)))))) + +(defun doom*switch-buffer-hooks (orig-fn buffer-or-name &rest args) + (if (or doom-inhibit-switch-buffer-hooks + (eq (get-buffer buffer-or-name) (current-buffer))) + (apply orig-fn buffer-or-name args) + (let ((doom-inhibit-switch-buffer-hooks t)) + (run-hooks 'doom-exit-buffer-hook) + (prog1 (apply orig-fn buffer-or-name args) + (when (buffer-live-p (get-buffer buffer-or-name)) + (with-current-buffer buffer-or-name + (run-hooks 'doom-enter-buffer-hook))))))) + +(defun doom|init-switch-hooks (&optional disable) + "Set up enter/exit hooks for windows and buffers. + +See `doom-enter-buffer-hook', `doom-enter-window-hook', `doom-exit-buffer-hook' +and `doom-exit-window-hook'." + (dolist (spec '((select-window . doom*switch-window-hooks) + (switch-to-buffer . doom*switch-buffer-hooks) + (display-buffer . doom*switch-buffer-hooks) + (pop-to-buffer . doom*switch-buffer-hooks))) + (if disable + (advice-remove (car spec) (cdr spec)) + (advice-add (car spec) :around (cdr spec))))) + +(defun doom*load-theme-hooks (theme &rest _) + "Set up `doom-load-theme-hook' to run after `load-theme' is called." + (setq doom-theme theme) + (run-hooks 'doom-load-theme-hook)) + +(defun doom|protect-visible-buffer () + "Don't kill the current buffer if it is visible in another window (bury it +instead). Meant for `kill-buffer-query-functions'." + (not (and (delq (selected-window) (get-buffer-window-list nil nil t)) + (not (member (substring (buffer-name) 0 1) '(" " "*")))))) + +(defun doom|protect-fallback-buffer () + "Don't kill the scratch buffer. Meant for `kill-buffer-query-functions'." + (not (eq (current-buffer) (doom-fallback-buffer)))) + +(defun doom|highlight-non-default-indentation () + "Highlight whitespace that doesn't match your `indent-tabs-mode' setting. + +e.g. If you indent with spaces by default, tabs will be highlighted. If you +indent with tabs, spaces at BOL are highlighted. + +Does nothing if `whitespace-mode' is already active or the current buffer is +read-only or not file-visiting." + (unless (or (bound-and-true-p global-whitespace-mode) + (bound-and-true-p whitespace-mode) + (eq major-mode 'fundamental-mode) + buffer-read-only + (null buffer-file-name)) + (require 'whitespace) + (set (make-local-variable 'whitespace-style) + (if (bound-and-true-p whitespace-newline-mode) + (cl-union (if indent-tabs-mode '(indentation) '(tabs tab-mark)) + whitespace-style) + `(face ,@(if indent-tabs-mode '(indentation) '(tabs tab-mark)) + trailing-lines tail))) + (whitespace-mode +1))) + + +;; +;;; General configuration + (defvar doom--prefer-theme-elc nil "If non-nil, `load-theme' will prefer the compiled theme (unlike its default behavior). Do not set this directly, this is let-bound in `doom|init-theme'.") @@ -71,6 +187,7 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.") display-line-numbers-width 3 enable-recursive-minibuffers nil frame-inhibit-implied-resize t + frame-title-format '("%b – Doom Emacs") ; simple name in frame title ;; remove continuation arrow on right fringe fringe-indicator-alist (delq (assq 'continuation fringe-indicator-alist) @@ -99,68 +216,41 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.") ;; don't resize emacs in steps, it looks weird window-resize-pixelwise t frame-resize-pixelwise t) - ;; y/n instead of yes/no (fset #'yes-or-no-p #'y-or-n-p) - ;; Truly silence startup message (fset #'display-startup-echo-area-message #'ignore) +;; relegate tooltips to echo area only +(if (bound-and-true-p tooltip-mode) (tooltip-mode -1)) +;; enabled by default; no thanks, too distracting +(blink-cursor-mode -1) +;; Handle ansi codes in compilation buffer +(add-hook 'compilation-filter-hook #'doom|apply-ansi-color-to-compilation-buffer) +;; show typed keystrokes in minibuffer +(defun doom|enable-ui-keystrokes () (setq echo-keystrokes 0.02)) +(defun doom|disable-ui-keystrokes () (setq echo-keystrokes 0)) +(doom|enable-ui-keystrokes) +;; ...but hide them while isearch is active +(add-hook 'isearch-mode-hook #'doom|disable-ui-keystrokes) +(add-hook 'isearch-mode-end-hook #'doom|enable-ui-keystrokes) +;; Make `next-buffer', `other-buffer', etc. ignore unreal buffers. +(add-to-list 'default-frame-alist '(buffer-predicate . doom-buffer-frame-predicate)) +;; Prevent the glimpse of un-styled Emacs by setting these early. +(add-to-list 'default-frame-alist '(tool-bar-lines . 0)) +(add-to-list 'default-frame-alist '(menu-bar-lines . 0)) +(add-to-list 'default-frame-alist '(vertical-scroll-bars)) +;; prompts the user for confirmation when deleting a non-empty frame +(global-set-key [remap delete-frame] #'doom/delete-frame) ;; -;; Third party packages +;;; Built-in packages -;; `avy' -(setq avy-all-windows nil - avy-background t) +;; Disable these because whitespace should be customized programmatically +;; (through `whitespace-style'), and not through these commands. +(put 'whitespace-toggle-options 'disabled t) +(put 'global-whitespace-toggle-options 'disabled t) -;; `all-the-icons' -(def-package! all-the-icons - :commands (all-the-icons-octicon all-the-icons-faicon all-the-icons-fileicon - all-the-icons-wicon all-the-icons-material all-the-icons-alltheicon) - :init - (defun doom*disable-all-the-icons-in-tty (orig-fn &rest args) - (if (display-graphic-p) - (apply orig-fn args) - "")) - :config - ;; all-the-icons doesn't work in the terminal, so we "disable" it. - (dolist (fn '(all-the-icons-octicon all-the-icons-material - all-the-icons-faicon all-the-icons-fileicon - all-the-icons-wicon all-the-icons-alltheicon)) - (advice-add fn :around #'doom*disable-all-the-icons-in-tty))) - -;; `hide-mode-line-mode' -(add-hook 'completion-list-mode-hook #'hide-mode-line-mode) -(add-hook 'Man-mode-hook #'hide-mode-line-mode) - -;; `highlight-numbers' --- better number literal fontification in code -(def-package! highlight-numbers - :hook ((prog-mode conf-mode) . highlight-numbers-mode) - :config (setq highlight-numbers-generic-regexp "\\_<[[:digit:]]+\\(?:\\.[0-9]*\\)?\\_>")) - -;; `highlight-escape-sequences' -(def-package! highlight-escape-sequences - :hook ((prog-mode conf-mode) . highlight-escape-sequences-mode)) - -;; `rainbow-delimiters' --- helps us distinguish stacked delimiter pairs. -;; Especially in parentheses-drunk languages like Lisp. -(setq rainbow-delimiters-max-face-count 3) - -;; `restart-emacs' --- provides a simple mechanism for restarting Emacs and -;; daemons interactively. -(setq restart-emacs--args (list "--restore")) - -;; `visual-fill-column' --- for a distractions-free-like UI, that dynamically -;; resizes margins and can center a buffer. -(setq visual-fill-column-center-text t - visual-fill-column-width - ;; take Emacs 26 line numbers into account - (+ (if EMACS26+ 6 0) fill-column)) - - -;; -;; Built-in packages (def-package! ediff :defer t @@ -259,7 +349,55 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.") ;; -;; Line numbers +;;; Third party packages + +;; `avy' +(setq avy-all-windows nil + avy-background t) + +;; `all-the-icons' +(def-package! all-the-icons + :commands (all-the-icons-octicon all-the-icons-faicon all-the-icons-fileicon + all-the-icons-wicon all-the-icons-material all-the-icons-alltheicon) + :init + (defun doom*disable-all-the-icons-in-tty (orig-fn &rest args) + (if (display-graphic-p) + (apply orig-fn args) + "")) + :config + ;; all-the-icons doesn't work in the terminal, so we "disable" it. + (dolist (fn '(all-the-icons-octicon all-the-icons-material + all-the-icons-faicon all-the-icons-fileicon + all-the-icons-wicon all-the-icons-alltheicon)) + (advice-add fn :around #'doom*disable-all-the-icons-in-tty))) + +;; `hide-mode-line-mode' +(add-hook 'completion-list-mode-hook #'hide-mode-line-mode) +(add-hook 'Man-mode-hook #'hide-mode-line-mode) + +;; `highlight-numbers' --- better number literal fontification in code +(def-package! highlight-numbers + :hook ((prog-mode conf-mode) . highlight-numbers-mode) + :config (setq highlight-numbers-generic-regexp "\\_<[[:digit:]]+\\(?:\\.[0-9]*\\)?\\_>")) + +;; `highlight-escape-sequences' +(def-package! highlight-escape-sequences + :hook ((prog-mode conf-mode) . highlight-escape-sequences-mode)) + +;; `rainbow-delimiters' --- helps us distinguish stacked delimiter pairs. +;; Especially in parentheses-drunk languages like Lisp. +(setq rainbow-delimiters-max-face-count 3) + +;; `visual-fill-column' --- for a distractions-free-like UI, that dynamically +;; resizes margins and can center a buffer. +(setq visual-fill-column-center-text t + visual-fill-column-width + ;; take Emacs 26 line numbers into account + (+ (if EMACS26+ 6 0) fill-column)) + + +;; +;;; Line numbers ;; line numbers in most modes (add-hook! (prog-mode text-mode conf-mode) #'display-line-numbers-mode) @@ -267,8 +405,7 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.") (defun doom|enable-line-numbers () (display-line-numbers-mode +1)) (defun doom|disable-line-numbers () (display-line-numbers-mode -1)) -;; Emacs 26+ has native line number support, and will ignore nlinum. This is for -;; Emacs 25 users: +;; `nlinum' is used for Emacs 25 users, as Emacs 26+ has native line numbers. (def-package! nlinum ;; Line number column. A faster (or equivalent, in the worst case) line number ;; plugin than `linum-mode'. @@ -332,7 +469,7 @@ character that looks like a space that `whitespace-mode' won't affect.") (advice-add #'web-mode-fold-or-unfold :after #'nlinum-hl-do-generic-flush) ;; Changing fonts can leave nlinum line numbers in their original size; this ;; forces them to resize. - (advice-add #'set-frame-font :after #'nlinum-hl-flush-all-windows)) + (add-hook 'after-setting-font-hook #'nlinum-hl-flush-all-windows)) (def-package! nlinum-relative :unless EMACS26+ @@ -343,7 +480,7 @@ character that looks like a space that `whitespace-mode' won't affect.") ;; -;; Theme & font +;;; Theme & font (defvar doom-last-window-system (if (daemonp) 'daemon initial-window-system) @@ -417,93 +554,27 @@ frame's window-system, the theme will be reloaded.") ;; -;; Bootstrap - -;; simple name in frame title -(setq frame-title-format '("%b – Doom Emacs")) - -;; relegate tooltips to echo area only -(if (boundp 'tooltip-mode) (tooltip-mode -1)) - -;; enabled by default; no thanks, too distracting -(blink-cursor-mode -1) - -;; Handle ansi codes in compilation buffer -(add-hook 'compilation-filter-hook #'doom|apply-ansi-color-to-compilation-buffer) - -;; show typed keystrokes in minibuffer -(defun doom|enable-ui-keystrokes () (setq echo-keystrokes 0.02)) -(defun doom|disable-ui-keystrokes () (setq echo-keystrokes 0)) -(doom|enable-ui-keystrokes) -;; ...but hide them while isearch is active -(add-hook 'isearch-mode-hook #'doom|disable-ui-keystrokes) -(add-hook 'isearch-mode-end-hook #'doom|enable-ui-keystrokes) - -;; Make `next-buffer', `other-buffer', etc. ignore unreal buffers. -(add-to-list 'default-frame-alist '(buffer-predicate . doom-buffer-frame-predicate)) -;; Prevent the glimpse of un-styled Emacs by setting these early. -(add-to-list 'default-frame-alist '(tool-bar-lines . 0)) -(add-to-list 'default-frame-alist '(menu-bar-lines . 0)) -(add-to-list 'default-frame-alist '(vertical-scroll-bars)) -;; prompts the user for confirmation when deleting a non-empty frame -(global-set-key [remap delete-frame] #'doom/delete-frame) - -(defun doom|protect-visible-buffer () - "Don't kill the current buffer if it is visible in another window (bury it -instead). Meant for `kill-buffer-query-functions'." - (not (and (delq (selected-window) (get-buffer-window-list nil nil t)) - (not (member (substring (buffer-name) 0 1) '(" " "*")))))) - -(defun doom|protect-fallback-buffer () - "Don't kill the scratch buffer. Meant for `kill-buffer-query-functions'." - (not (eq (current-buffer) (doom-fallback-buffer)))) - -(defun doom|highlight-non-default-indentation () - "Highlight whitespace that doesn't match your `indent-tabs-mode' setting. - -e.g. If you indent with spaces by default, tabs will be highlighted. If you -indent with tabs, spaces at BOL are highlighted. - -Does nothing if `whitespace-mode' is already active or the current buffer is -read-only or not file-visiting." - (unless (or (bound-and-true-p global-whitespace-mode) - (bound-and-true-p whitespace-mode) - (eq major-mode 'fundamental-mode) - buffer-read-only - (null buffer-file-name)) - (require 'whitespace) - (set (make-local-variable 'whitespace-style) - (if (bound-and-true-p whitespace-newline-mode) - (cl-union (if indent-tabs-mode '(indentation) '(tabs tab-mark)) - whitespace-style) - `(face ,@(if indent-tabs-mode '(indentation) '(tabs tab-mark)) - trailing-lines tail))) - (whitespace-mode +1))) +;;; Bootstrap (defun doom|init-ui () "Initialize Doom's user interface by applying all its advice and hooks." - (add-to-list 'kill-buffer-query-functions #'doom|protect-fallback-buffer nil #'eq) - (add-to-list 'kill-buffer-query-functions #'doom|protect-visible-buffer nil #'eq) + (add-to-list 'kill-buffer-query-functions #'doom|protect-fallback-buffer nil 'eq) + (add-to-list 'kill-buffer-query-functions #'doom|protect-visible-buffer nil 'eq) (add-hook 'after-change-major-mode-hook #'doom|highlight-non-default-indentation) (run-hook-wrapped 'doom-init-ui-hook #'doom-try-run-hook)) +(advice-add #'load-theme :after #'doom*load-theme-hooks) +(add-hook 'emacs-startup-hook #'doom|init-switch-hooks) (add-hook 'emacs-startup-hook #'doom|init-ui) ;; -;; Fixes/hacks +;;; Fixes/hacks ;; doesn't exist in terminal Emacs; we define it to prevent errors (unless (fboundp 'define-fringe-bitmap) (defun define-fringe-bitmap (&rest _))) -(defun doom*disable-old-themes-first (orig-fn &rest args) - (mapc #'disable-theme custom-enabled-themes) - (apply orig-fn args) - (when (fboundp 'powerline-reset) - (powerline-reset))) -(advice-add #'load-theme :around #'doom*disable-old-themes-first) - (defun doom*prefer-compiled-theme (orig-fn &rest args) "Make `load-theme' prioritize the byte-compiled theme for a moderate boost in startup (or theme switch) time, so long as `doom--prefer-theme-elc' is non-nil." @@ -517,6 +588,14 @@ startup (or theme switch) time, so long as `doom--prefer-theme-elc' is non-nil." (apply orig-fn args))) (advice-add #'load-theme :around #'doom*prefer-compiled-theme) +(after! whitespace + (defun doom*disable-whitespace-mode-in-childframes (orig-fn) + "`whitespace-mode' inundates child frames with whitspace markers, so disable +it to fix all that visual noise." + (unless (frame-parameter frame 'parent-frame) + (funcall orig-fn))) + (add-function :around whitespace-enable-predicate #'doom*disable-whitespace-mode-in-childframes)) + (defun doom|disable-whitespace-mode-in-childframes (frame) "`whitespace-mode' inundates child frames with whitspace markers, so disable it to fix all that visual noise." diff --git a/core/core.el b/core/core.el index 1b5344a7b..f208e06bb 100644 --- a/core/core.el +++ b/core/core.el @@ -125,82 +125,6 @@ else (except for `window-setup-hook').") (defvar doom-reload-hook nil "A list of hooks to run when `doom/reload' is called.") -(defvar doom-load-theme-hook nil - "Hook run after the theme is loaded with `load-theme' or reloaded with -`doom/reload-theme'.") - -(defvar doom-exit-window-hook nil - "Hook run before `switch-window' or `switch-frame' are called. - -Also see `doom-enter-window-hook'.") - -(defvar doom-enter-window-hook nil - "Hook run after `switch-window' or `switch-frame' are called. - -Also see `doom-exit-window-hook'.") - -(defvar doom-exit-buffer-hook nil - "Hook run after `switch-to-buffer', `pop-to-buffer' or `display-buffer' are -called. The buffer to be switched to is current when these hooks run. - -Also see `doom-enter-buffer-hook'.") - -(defvar doom-enter-buffer-hook nil - "Hook run before `switch-to-buffer', `pop-to-buffer' or `display-buffer' are -called. The buffer to be switched to is current when these hooks run. - -Also see `doom-exit-buffer-hook'.") - -(defvar doom-inhibit-switch-buffer-hooks nil - "Letvar for inhibiting `doom-enter-buffer-hook' and `doom-exit-buffer-hook'. -Do not set this directly.") -(defvar doom-inhibit-switch-window-hooks nil - "Letvar for inhibiting `doom-enter-window-hook' and `doom-exit-window-hook'. -Do not set this directly.") - -(defun doom*switch-window-hooks (orig-fn window &optional norecord) - (if (or doom-inhibit-switch-window-hooks - (null window) - (eq window (selected-window)) - (window-minibuffer-p) - (window-minibuffer-p window)) - (funcall orig-fn window norecord) - (let ((doom-inhibit-switch-window-hooks t)) - (run-hooks 'doom-exit-window-hook) - (prog1 (funcall orig-fn window norecord) - (with-selected-window window - (run-hooks 'doom-enter-window-hook)))))) - -(defun doom*switch-buffer-hooks (orig-fn buffer-or-name &rest args) - (if (or doom-inhibit-switch-buffer-hooks - (eq (get-buffer buffer-or-name) (current-buffer))) - (apply orig-fn buffer-or-name args) - (let ((doom-inhibit-switch-buffer-hooks t)) - (run-hooks 'doom-exit-buffer-hook) - (prog1 (apply orig-fn buffer-or-name args) - (when (buffer-live-p (get-buffer buffer-or-name)) - (with-current-buffer buffer-or-name - (run-hooks 'doom-enter-buffer-hook))))))) - -(defun doom|init-switch-hooks (&optional disable) - "Set up enter/exit hooks for windows and buffers. - -See `doom-enter-buffer-hook', `doom-enter-window-hook', `doom-exit-buffer-hook' -and `doom-exit-window-hook'." - (dolist (spec '((select-window . doom*switch-window-hooks) - (switch-to-buffer . doom*switch-buffer-hooks) - (display-buffer . doom*switch-buffer-hooks) - (pop-to-buffer . doom*switch-buffer-hooks))) - (if disable - (advice-remove (car spec) (cdr spec)) - (advice-add (car spec) :around (cdr spec))))) - -(defun doom*load-theme-hooks (theme &rest _) - "Set up `doom-load-theme-hook' to run after `load-theme' is called." - (setq doom-theme theme) - (run-hooks 'doom-load-theme-hook)) -(advice-add #'load-theme :after #'doom*load-theme-hooks) - ;; ;; Emacs core configuration @@ -342,7 +266,7 @@ If you want to disable incremental loading altogether, either remove Set this to nil to disable incremental loading.") -(defvar doom-incremental-idle-timer 1.5 +(defvar doom-incremental-idle-timer 1 "How long (in idle seconds) in between incrementally loading packages.") (defun doom-load-packages-incrementally (packages &optional now) @@ -516,8 +440,7 @@ to least)." (require 'core-os) (when (or force-load-core-p (not noninteractive)) - (add-hook! 'emacs-startup-hook - #'(doom|init-switch-hooks doom|display-benchmark)) + (add-hook 'emacs-startup-hook #'doom|display-benchmark) (require 'core-ui) (require 'core-editor) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 560faeb10..fd89702e1 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -600,14 +600,14 @@ :desc "Find file in project" "/" #'projectile-find-file :desc "Find file in other project" "?" #'doom/find-file-in-other-project :desc "Browse emacs.d" "E" #'+default/browse-emacsd - :desc "Browse private config" "P" #'+default/browse-config + :desc "Browse private config" "P" #'doom/open-private-config :desc "Recent project files" "R" #'projectile-recentf :desc "Delete this file" "X" #'doom/delete-this-file :desc "Find other file" "a" #'projectile-find-other-file :desc "Open project editorconfig" "c" #'editorconfig-find-current-editorconfig :desc "Find directory" "d" #'dired :desc "Find file in emacs.d" "e" #'+default/find-in-emacsd - :desc "Find file in private config" "p" #'+default/find-in-config + :desc "Find file in private config" "p" #'doom/find-file-in-private-config :desc "Recent files" "r" #'recentf-open-files :desc "Save file" "s" #'save-buffer :desc "Sudo find file" "S" #'doom/sudo-find-file diff --git a/modules/config/default/autoload/default.el b/modules/config/default/autoload/default.el index 654f40f41..8ee64bbea 100644 --- a/modules/config/default/autoload/default.el +++ b/modules/config/default/autoload/default.el @@ -34,18 +34,6 @@ (defun +default/find-in-notes () (interactive) (doom-project-find-file org-directory)) -;;;###autoload -(defun +default/find-in-config () - "Open a file somewhere in `doom-private-dir' via a fuzzy filename search." - (interactive) - (doom-project-find-file doom-private-dir)) - -;;;###autoload -(defun +default/browse-config () - "Browse the files in `doom-private-dir'." - (interactive) - (doom-project-browse doom-private-dir)) - ;;;###autoload (defun +default/compile (arg) "Runs `compile' from the root of the current project. diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el index e684795b4..8bbbe9267 100644 --- a/modules/ui/doom-dashboard/config.el +++ b/modules/ui/doom-dashboard/config.el @@ -66,7 +66,7 @@ Possible values: ("Open private configuration" :icon (all-the-icons-octicon "tools" :face 'font-lock-keyword-face) :when (file-directory-p doom-private-dir) - :action +default/find-in-config) + :action doom/open-private-config) ("Open user manual" :icon (all-the-icons-octicon "book" :face 'font-lock-keyword-face) :when (file-exists-p (expand-file-name "index.org" doom-docs-dir))