emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
doomemacs/modules/ui/modeline/config.el

86 lines
3.4 KiB
EmacsLisp
Raw Normal View History

Polish & move new modeline into :ui modeline Removes modeline library out of core-ui and contains them in :ui doom-modeline and :ui modeline. :ui modeline will eventually replace :ui doom-modeline, but is still considered experimental. This update provides makes it much more stable and closer to being feature complete.
2018-07-29 02:50:16 +02:00
;;; ui/modeline/config.el -*- lexical-binding: t; -*-
refactor: deprecate featurep! for modulep! featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
2022-08-12 20:29:19 +02:00
(when (modulep! +light)
ui/modeline: add +light feature This will one day replace the module.
2019-12-13 19:54:30 -05:00
(load! "+light"))
:boom: Rename def-package! -> use-package! Calling this pivotal macro "def-package!" has frequently been a source of confusion. It is a thin wrapper around use-package, and it should be obvious that it is so. For this reason, and to match the naming convention used with other convenience macros/wrappers, it is now use-package!. Also changes def-package-hook! -> use-package-hook! The old macros are now marked obsolete and will be removed when straight integration is merged.
2019-07-23 12:44:03 +02:00
(use-package! doom-modeline
refactor: deprecate featurep! for modulep! featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
2022-08-12 20:29:19 +02:00
:unless (modulep! +light)
bump: :ui modeline emacsorphanage/evil-anzu@d3f6ed4773b4 -> emacsorphanage/evil-anzu@d1e98ee69764 seagle0128/doom-modeline@ce9899f00af4 -> seagle0128/doom-modeline@bed80b82d7bf Also improves Emacs 29 compatibility (see ref). Ref: emacs-mirror/emacs@d0a66f3e0e66
2022-09-16 12:43:45 +02:00
:hook (doom-after-init . doom-modeline-mode)
Enable {size-indicator,column-number}-mode on doom-modeline-mode
2020-04-09 17:48:47 -04:00
:hook (doom-modeline-mode . size-indication-mode) ; filesize in modeline
:hook (doom-modeline-mode . column-number-mode) ; cursor column in modeline
:boom: Rethink core hook order & naming - doom-post-init-hook was renamed doom-init-modules-hook - doom-init-hook was renamed doom-before-init-modules-hook - doom-init-modules-hook now runs before the user's config.el is run - Moved doom-init-ui-hook to run later (on window-setup-hook rather than emacs-startup-hook). Yield a modest improvement in startup times.
2019-03-04 20:35:47 -05:00
:init
bump: :ui modeline emacsorphanage/evil-anzu@d3f6ed4773b4 -> emacsorphanage/evil-anzu@d1e98ee69764 seagle0128/doom-modeline@ce9899f00af4 -> seagle0128/doom-modeline@bed80b82d7bf Also improves Emacs 29 compatibility (see ref). Ref: emacs-mirror/emacs@d0a66f3e0e66
2022-09-16 12:43:45 +02:00
(when (>= emacs-major-version 29)
;; HACK: Emacs 29 treats `nil' for :background as invalid, and complains.
;; `doom-modeline' hasn't updated its face to address this yet.
;; REVIEW: PR this fix to doom-modeline
(defface doom-modeline-buffer-modified
'((t (:inherit (error bold) :background unspecified)))
"Face used for the \\='unsaved\\=' symbol in the mode-line."
:group 'doom-modeline-faces))
Adopt seagle0128/doom-modeline for :ui modeline And remove obsolete :ui doom-modeline module. Relevant to: #136, #921
2019-03-01 15:12:27 -05:00
;; We display project info in the modeline ourselves
(setq projectile-dynamic-mode-line nil)
:boom: Rethink core hook order & naming - doom-post-init-hook was renamed doom-init-modules-hook - doom-init-hook was renamed doom-before-init-modules-hook - doom-init-modules-hook now runs before the user's config.el is run - Moved doom-init-ui-hook to run later (on window-setup-hook rather than emacs-startup-hook). Yield a modest improvement in startup times.
2019-03-04 20:35:47 -05:00
;; Set these early so they don't trigger variable watchers
Adopt seagle0128/doom-modeline for :ui modeline And remove obsolete :ui doom-modeline module. Relevant to: #136, #921
2019-03-01 15:12:27 -05:00
(setq doom-modeline-bar-width 3
doom-modeline-github nil
doom-modeline-mu4e nil
doom-modeline-persp-name nil
doom-modeline-minor-modes nil
doom-modeline-major-mode-icon nil
ui/modeline: don't show encoding unless nondefault
2021-05-16 21:15:55 -04:00
doom-modeline-buffer-file-name-style 'relative-from-project
;; Only show file encoding if it's non-UTF-8 and different line endings
;; than the current OSes preference
doom-modeline-buffer-encoding 'nondefault
doom-modeline-default-eol-type
(cond (IS-MAC 2)
(IS-WINDOWS 1)
(0)))
ui/modeline: fix icons in daemon-spawned frames Fix modeline icons in daemon-spawned graphical frames. We have our own mechanism for disabling all-the-icons, so we don't need doom-modeline to do it for us. However, this may cause unwanted padding in the modeline in daemon-spawned terminal frames. If it bothers you, you may prefer `doom-modeline-icon' set to `nil'.
2019-03-25 01:28:29 -04:00
;; Fix modeline icons in daemon-spawned graphical frames. We have our own
;; mechanism for disabling all-the-icons, so we don't need doom-modeline to do
;; it for us. However, this may cause unwanted padding in the modeline in
;; daemon-spawned terminal frames. If it bothers you, you may prefer
;; `doom-modeline-icon' set to `nil'.
(when (daemonp)
(setq doom-modeline-icon t))
:boom: Rethink core hook order & naming - doom-post-init-hook was renamed doom-init-modules-hook - doom-init-hook was renamed doom-before-init-modules-hook - doom-init-modules-hook now runs before the user's config.el is run - Moved doom-init-ui-hook to run later (on window-setup-hook rather than emacs-startup-hook). Yield a modest improvement in startup times.
2019-03-04 20:35:47 -05:00
:config
Fix #4102: wrong-type-arg plistp errors in daemon tty frames
2020-10-22 02:10:59 -04:00
;; HACK Fix #4102 due to empty all-the-icons return value (caused by
;; `doom--disable-all-the-icons-in-tty-a' advice) in tty daemon frames.
refactor: rename orig-fn arg in advice to fn A minor tweak to our naming conventions for the first argument of an :around advice.
2021-08-04 01:18:06 -04:00
(defadvice! +modeline-disable-icon-in-daemon-a (fn &rest args)
Fix #4102: wrong-type-arg plistp errors in daemon tty frames
2020-10-22 02:10:59 -04:00
:around #'doom-modeline-propertize-icon
(when (display-graphic-p)
refactor: rename orig-fn arg in advice to fn A minor tweak to our naming conventions for the first argument of an :around advice.
2021-08-04 01:18:06 -04:00
(apply fn args)))
Fix #4102: wrong-type-arg plistp errors in daemon tty frames
2020-10-22 02:10:59 -04:00
Fix void-variable mouse-wheel-{up,down}-event errors
2019-05-06 16:54:37 -04:00
;; Fix an issue where these two variables aren't defined in TTY Emacs on MacOS
(defvar mouse-wheel-down-event nil)
(defvar mouse-wheel-up-event nil)
Resize modeline when resizing fonts Possibly fixes #3040
2020-05-05 16:28:29 -04:00
(add-hook 'after-setting-font-hook #'+modeline-resize-for-font-h)
Adopt seagle0128/doom-modeline for :ui modeline And remove obsolete :ui doom-modeline module. Relevant to: #136, #921
2019-03-01 15:12:27 -05:00
(add-hook 'doom-load-theme-hook #'doom-modeline-refresh-bars)
:boom: Rethink core hook order & naming - doom-post-init-hook was renamed doom-init-modules-hook - doom-init-hook was renamed doom-before-init-modules-hook - doom-init-modules-hook now runs before the user's config.el is run - Moved doom-init-ui-hook to run later (on window-setup-hook rather than emacs-startup-hook). Yield a modest improvement in startup times.
2019-03-04 20:35:47 -05:00
bump: :ui modeline emacsorphanage/evil-anzu@d3f6ed4773b4 -> emacsorphanage/evil-anzu@d1e98ee69764 seagle0128/doom-modeline@ce9899f00af4 -> seagle0128/doom-modeline@bed80b82d7bf Also improves Emacs 29 compatibility (see ref). Ref: emacs-mirror/emacs@d0a66f3e0e66
2022-09-16 12:43:45 +02:00
(add-to-list 'doom-modeline-mode-alist '(+doom-dashboard-mode . dashboard))
Correct last inline hook defuns See a3e262c7 for rationale
2019-07-28 14:52:59 +02:00
(add-hook! 'magit-mode-hook
Fix 'command not found' errors for hidden commands
2019-07-22 04:46:14 +02:00
(defun +modeline-hide-in-non-status-buffer-h ()
:boom: revise hook/var fns naming convention (2/2) This is second of three big naming convention changes. In this commit, we change the naming conventions for hook functions and variable functions: 1. Replace the bar | to indicate a hook function with a -h suffix, e.g. doom|init-ui -> doom-init-ui-h doom|run-local-var-hooks -> doom-run-local-var-hooks-h 2. And add a -fn suffix for functions meant to be set on variables, e.g. (setq magit-display-buffer-function #'+magit-display-buffer-fn) See ccf327f8 for the reasoning behind these changes.
2019-07-18 15:27:20 +02:00
"Show minimal modeline in magit-status buffer, no modeline elsewhere."
(if (eq major-mode 'magit-status-mode)
bump: :ui modeline emacsorphanage/evil-anzu@d3f6ed4773b4 -> emacsorphanage/evil-anzu@d1e98ee69764 seagle0128/doom-modeline@ce9899f00af4 -> seagle0128/doom-modeline@bed80b82d7bf Also improves Emacs 29 compatibility (see ref). Ref: emacs-mirror/emacs@d0a66f3e0e66
2022-09-16 12:43:45 +02:00
(doom-modeline-set-modeline 'magit)
:boom: revise hook/var fns naming convention (2/2) This is second of three big naming convention changes. In this commit, we change the naming conventions for hook functions and variable functions: 1. Replace the bar | to indicate a hook function with a -h suffix, e.g. doom|init-ui -> doom-init-ui-h doom|run-local-var-hooks -> doom-run-local-var-hooks-h 2. And add a -fn suffix for functions meant to be set on variables, e.g. (setq magit-display-buffer-function #'+magit-display-buffer-fn) See ccf327f8 for the reasoning behind these changes.
2019-07-18 15:27:20 +02:00
(hide-mode-line-mode))))
Polish & move new modeline into :ui modeline Removes modeline library out of core-ui and contains them in :ui doom-modeline and :ui modeline. :ui modeline will eventually replace :ui doom-modeline, but is still considered experimental. This update provides makes it much more stable and closer to being feature complete.
2018-07-29 02:50:16 +02:00
Prevent false modified indicator in modeline Mentioned in seagle0128/doom-modeline#129 Remove advice when lewang/ws-butler#31 is merged
2019-03-04 11:57:14 -05:00
;; Some functions modify the buffer, causing the modeline to show a false
:boom: revise advice naming convention (1/2) This is first of three big naming convention updates that have been a long time coming. With 2.1 on the horizon, all the breaking updates will batched together in preparation for the long haul. In this commit, we do away with the asterix to communicate that a function is an advice function, and we replace it with the '-a' suffix. e.g. doom*shut-up -> doom-shut-up-a doom*recenter -> doom-recenter-a +evil*static-reindent -> +evil--static-reindent-a The rationale behind this change is: 1. Elisp's own formatting/indenting tools would occasionally struggle with | and * (particularly pp and cl-prettyprint). They have no problem with / and :, fortunately. 2. External syntax highlighters (like pygmentize, discord markdown or github markdown) struggle with it, sometimes refusing to highlight code beyond these symbols. 3. * and | are less expressive than - and -- in communicating the intended visibility, versatility and stability of a function. 4. It complicated the regexps we must use to search for them. 5. They were arbitrary and over-complicated to begin with, decided on haphazardly way back when Doom was simply "my private config". Anyhow, like how predicate functions have the -p suffix, we'll adopt the -a suffix for advice functions, -h for hook functions and -fn for variable functions. Other noteable changes: - Replaces advice-{add,remove}! macro with new def-advice! macro. The old pair weren't as useful. The new def-advice! saves on a lot of space. - Removed "stage" assertions to make sure you were using the right macros in the right place. Turned out to not be necessary, we'll employ better checks later.
2019-07-18 15:42:52 +02:00
;; modified state, so force them to behave.
refactor: rename orig-fn arg in advice to fn A minor tweak to our naming conventions for the first argument of an :around advice.
2021-08-04 01:18:06 -04:00
(defadvice! +modeline--inhibit-modification-hooks-a (fn &rest args)
:boom: revise advice naming convention (1/2) This is first of three big naming convention updates that have been a long time coming. With 2.1 on the horizon, all the breaking updates will batched together in preparation for the long haul. In this commit, we do away with the asterix to communicate that a function is an advice function, and we replace it with the '-a' suffix. e.g. doom*shut-up -> doom-shut-up-a doom*recenter -> doom-recenter-a +evil*static-reindent -> +evil--static-reindent-a The rationale behind this change is: 1. Elisp's own formatting/indenting tools would occasionally struggle with | and * (particularly pp and cl-prettyprint). They have no problem with / and :, fortunately. 2. External syntax highlighters (like pygmentize, discord markdown or github markdown) struggle with it, sometimes refusing to highlight code beyond these symbols. 3. * and | are less expressive than - and -- in communicating the intended visibility, versatility and stability of a function. 4. It complicated the regexps we must use to search for them. 5. They were arbitrary and over-complicated to begin with, decided on haphazardly way back when Doom was simply "my private config". Anyhow, like how predicate functions have the -p suffix, we'll adopt the -a suffix for advice functions, -h for hook functions and -fn for variable functions. Other noteable changes: - Replaces advice-{add,remove}! macro with new def-advice! macro. The old pair weren't as useful. The new def-advice! saves on a lot of space. - Removed "stage" assertions to make sure you were using the right macros in the right place. Turned out to not be necessary, we'll employ better checks later.
2019-07-18 15:42:52 +02:00
:around #'ws-butler-after-save
refactor: rename orig-fn arg in advice to fn A minor tweak to our naming conventions for the first argument of an :around advice.
2021-08-04 01:18:06 -04:00
(with-silent-modifications (apply fn args)))
Polish & move new modeline into :ui modeline Removes modeline library out of core-ui and contains them in :ui doom-modeline and :ui modeline. :ui modeline will eventually replace :ui doom-modeline, but is still considered experimental. This update provides makes it much more stable and closer to being feature complete.
2018-07-29 02:50:16 +02:00
ui/modeline: add +light feature This will one day replace the module.
2019-12-13 19:54:30 -05:00
;;
;;; Extensions
(use-package! anzu
:after-call isearch-mode)
Polish & move new modeline into :ui modeline Removes modeline library out of core-ui and contains them in :ui doom-modeline and :ui modeline. :ui modeline will eventually replace :ui doom-modeline, but is still considered experimental. This update provides makes it much more stable and closer to being feature complete.
2018-07-29 02:50:16 +02:00
ui/modeline: add +light feature This will one day replace the module.
2019-12-13 19:54:30 -05:00
(use-package! evil-anzu
refactor: deprecate featurep! for modulep! featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
2022-08-12 20:29:19 +02:00
:when (modulep! :editor evil)
Enable global-anzu-mode after evil-anzu loads evil-anzu depends on anzu-mode being enabled to update its results, so we enable global-anzu-mode when evil-search (or isearch) is first invoked.
2020-05-27 14:04:40 -04:00
:after-call evil-ex-start-search evil-ex-start-word-search evil-ex-search-activate-highlight
:config (global-anzu-mode +1)))
Reference in a new issue Copy permalink