From ebc832d6e081a0c5f2108c48e11c70d0aea8fc3d Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 4 Dec 2021 21:15:02 +0000
Subject: modeline in minibuffer on demand

---
 init.org | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'init.org')

diff --git a/init.org b/init.org
index 5115fcc..612f79c 100644
--- a/init.org
+++ b/init.org
@@ -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
-- 
cgit v1.2.3