2018-07-29 02:50:16 +02:00
|
|
|
;;; ui/modeline/config.el -*- lexical-binding: t; -*-
|
|
|
|
|
|
2019-12-13 19:54:30 -05:00
|
|
|
(when (featurep! +light)
|
|
|
|
|
(load! "+light"))
|
|
|
|
|
|
|
|
|
|
|
2019-12-20 20:37:55 -05:00
|
|
|
(defvar +modeline--redisplayed-p nil)
|
|
|
|
|
(defadvice! modeline-recalculate-height-a (&optional _force &rest _ignored)
|
|
|
|
|
"Ensure that window resizing functions take modeline height into account."
|
|
|
|
|
:before '(fit-window-to-buffer resize-temp-buffer-window)
|
|
|
|
|
(unless +modeline--redisplayed-p
|
|
|
|
|
(setq-local +modeline--redisplayed-p t)
|
|
|
|
|
(redisplay t)))
|
|
|
|
|
|
|
|
|
|
|
2019-07-23 12:44:03 +02:00
|
|
|
(use-package! doom-modeline
|
2019-12-13 19:54:30 -05:00
|
|
|
:unless (featurep! +light)
|
2019-03-04 20:35:47 -05:00
|
|
|
:hook (after-init . 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
|
2019-03-04 20:35:47 -05:00
|
|
|
:init
|
2019-04-09 14:35:11 -04:00
|
|
|
(unless after-init-time
|
|
|
|
|
;; prevent flash of unstyled modeline at startup
|
|
|
|
|
(setq-default mode-line-format nil))
|
2019-03-01 15:12:27 -05:00
|
|
|
;; We display project info in the modeline ourselves
|
|
|
|
|
(setq projectile-dynamic-mode-line nil)
|
2019-03-04 20:35:47 -05:00
|
|
|
;; Set these early so they don't trigger variable watchers
|
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
|
|
|
|
|
doom-modeline-buffer-file-name-style 'relative-from-project)
|
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))
|
2019-03-04 20:35:47 -05:00
|
|
|
:config
|
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)
|
|
|
|
|
|
2020-05-05 16:28:29 -04:00
|
|
|
(add-hook 'after-setting-font-hook #'+modeline-resize-for-font-h)
|
2019-03-01 15:12:27 -05:00
|
|
|
(add-hook 'doom-load-theme-hook #'doom-modeline-refresh-bars)
|
2019-03-04 20:35:47 -05:00
|
|
|
|
2019-03-01 15:12:27 -05:00
|
|
|
(add-hook '+doom-dashboard-mode-hook #'doom-modeline-set-project-modeline)
|
2019-03-11 12:58:53 -04:00
|
|
|
|
2019-07-28 14:52:59 +02:00
|
|
|
(add-hook! 'magit-mode-hook
|
2019-07-22 04:46:14 +02:00
|
|
|
(defun +modeline-hide-in-non-status-buffer-h ()
|
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)
|
2020-02-28 12:20:21 -05:00
|
|
|
(doom-modeline-set-vcs-modeline)
|
2019-07-18 15:27:20 +02:00
|
|
|
(hide-mode-line-mode))))
|
2018-07-29 02:50:16 +02:00
|
|
|
|
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.
|
2019-07-23 17:24:56 +02:00
|
|
|
(defadvice! +modeline--inhibit-modification-hooks-a (orig-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
|
2019-12-13 19:54:30 -05:00
|
|
|
(with-silent-modifications (apply orig-fn args)))
|
2018-07-29 02:50:16 +02:00
|
|
|
|
|
|
|
|
|
2019-12-13 19:54:30 -05:00
|
|
|
;;
|
|
|
|
|
;;; Extensions
|
|
|
|
|
(use-package! anzu
|
|
|
|
|
:after-call isearch-mode)
|
2018-07-29 02:50:16 +02:00
|
|
|
|
2019-12-13 19:54:30 -05:00
|
|
|
(use-package! evil-anzu
|
|
|
|
|
:when (featurep! :editor evil)
|
|
|
|
|
:after-call evil-ex-start-search evil-ex-start-word-search evil-ex-search-activate-highlight))
|