diff options
| -rw-r--r-- | init.org | 20 | ||||
| -rw-r--r-- | lib/eos/jao-minibuffer.el | 26 |
2 files changed, 28 insertions, 18 deletions
@@ -603,6 +603,8 @@ * Mode line and minibuffer *** Minibuffer #+begin_src emacs-lisp + (defvar jao-modeline-in-minibuffer-p t) + (use-package jao-minibuffer :init (if (jao-colors-scheme-dark-p) @@ -621,8 +623,8 @@ (setq minibuffer-eldef-shorten-default t) (minibuffer-electric-default-mode 1) - (when window-system - (add-hook 'after-init-hook #'jao-toggle-inactive-mode-line)) + (when jao-modeline-in-minibuffer-p + (jao-minibuffer-add-mode-line 90)) #+end_src *** Time display #+BEGIN_SRC emacs-lisp @@ -714,7 +716,11 @@ (defun jao--show-inactive-mode-line (frame) (jao--set-inactive-face 'unspecified frame)) - (add-to-list 'after-make-frame-functions #'jao--hide-inactive-mode-line) + (when (and window-system (not jao-modeline-in-minibuffer-p)) + (add-hook 'after-init-hook #'jao-toggle-inactive-mode-line)) + + (unless jao-modeline-in-minibuffer-p + (add-to-list 'after-make-frame-functions #'jao--hide-inactive-mode-line)) (global-set-key (kbd "<home>") #'jao-toggle-inactive-mode-line) (global-set-key (kbd "<end>") #'jao-toggle-mode-line) @@ -738,10 +744,9 @@ "%L %r %B (%p%% load, remaining time %t)" battery-mode-line-format " %b%p ")) (display-battery-mode 1) - ;; (setq global-mode-string - ;; (delq 'battery-mode-line-string global-mode-string)) (with-eval-after-load "jao-minibuffer" - (jao-minibuffer-add-variable 'battery-mode-line-string 80)) + (unless jao-modeline-in-minibuffer-p + (jao-minibuffer-add-variable 'battery-mode-line-string 80))) #+end_src * Notifications *** alert @@ -1238,7 +1243,8 @@ (jao--show-inactive-mode-line nil) (jao--hide-inactive-mode-line nil))) - (add-hook 'jao-afio-switch-hook #'jao-afio--set-mode-line) + (unless jao-modeline-in-minibuffer-p + (add-hook 'jao-afio-switch-hook #'jao-afio--set-mode-line)) #+end_src * Writing and writing modes *** Org mode diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el index a6420c7..7dcdaf3 100644 --- a/lib/eos/jao-minibuffer.el +++ b/lib/eos/jao-minibuffer.el @@ -125,23 +125,27 @@ The padding pushes TEXT to the right edge of the mode-line." (:eval (format "%d" (line-number-at-pos (point-max))))))) (defvar jao-minibuffer--mode-line-format - `("%[" - (:eval (cond ((derived-mode-p 'gnus-group-mode - 'gnus-article-mode - 'gnus-summary-mode) - mode-line-buffer-identification) - ((derived-mode-p 'circe-channel-mode) - (format "%s [%d]" (buffer-name) (length (circe-channel-nicks)))) - (jao-notmuch--tree-buffer (buffer-name jao-notmuch--tree-buffer)) - ((not (null eww-data)) (plist-get eww-data :title)) - (t "%b"))) + `("· %[" + (:propertize + (:eval (cond ((derived-mode-p 'gnus-group-mode + 'gnus-article-mode + 'gnus-summary-mode) + mode-line-buffer-identification) + ((derived-mode-p 'circe-channel-mode) + (format "%s [%d]" (buffer-name) (length (circe-channel-nicks)))) + (jao-notmuch--tree-buffer (buffer-name jao-notmuch--tree-buffer)) + ((not (null eww-data)) (plist-get eww-data :title)) + (t "%b"))) + face jao-themes-f00 ;; (:family "Iosevka Term") + ) "%]" (:propertize " %*%+ " face jao-themes-warning) (:propertize mode-name face jao-themes-f00) (:propertize ("" minor-mode-alist (vc-mode vc-mode)) face jao-themes-f11) (:propertize mode-line-position face jao-themes-f12) " " - global-mode-string)) + global-mode-string + "·")) (defvar jao-minibuffer--original-modeline nil) |