jao-minibuffer-mode-line -> jao-mode-line

1 files changed, 20 insertions, 47 deletions

diff --git a/init.org b/init.org
index acf6601..c310be0 100644
--- a/init.org
+++ b/init.org
@@ -693,7 +693,7 @@
     #+end_src
 *** Minibuffer
     #+begin_src emacs-lisp
-      (defvar jao-modeline-in-minibuffer-p (and window-system t))
+      (defvar jao-modeline-in-minibuffer (and window-system t))
 
       (use-package jao-minibuffer
         :init
@@ -706,9 +706,9 @@
 		   jao-minibuffer-refresh
                    jao-minibuffer-mode))
 
-      (use-package jao-minibuffer-mode-line
-        :commands (jao-minibuffer-add-mode-line
-                   jao-minibuffer-remove-mode-line))
+      (use-package jao-mode-line
+        :commands (jao-mode-line-add-to-minibuffer
+                   jao-mode-line-remove-from-minibuffer))
 
       (setq enable-recursive-minibuffers t)
       (require 'mb-depth)
@@ -719,10 +719,10 @@
 
       (jao-minibuffer-mode 1)
 
-      (when jao-modeline-in-minibuffer-p
+      (when jao-modeline-in-minibuffer
         (add-hook 'display-time-hook #'jao-minibuffer-refresh)
         (add-hook 'after-init-hook
-                  (lambda () (jao-minibuffer-add-mode-line 90))))
+                  (lambda () (jao-mode-line-add-to-minibuffer 90))))
     #+end_src
 *** Mode line format
     #+begin_src emacs-lisp
@@ -736,41 +736,14 @@
     #+end_src
 *** Mode line toggle
     #+begin_src emacs-lisp
-      (defun jao-toggle--face-height (face &optional all)
-        (let* ((h (face-attribute face :height (window-frame)))
-               (nh (if (eq 'unspecified h) 1 'unspecified)))
-          (set-face-attribute face (when (not all) (window-frame)) :height nh)))
-
-      (defun jao-toggle-mode-line (&optional all)
-        (interactive "P")
-        (jao-toggle--face-height 'mode-line all))
-
-      (defun jao-toggle-inactive-mode-line (&optional all)
-        (interactive "P")
-        (jao-toggle--face-height 'mode-line-inactive all))
-
-      (defun jao-echo-mode-line ()
-        (interactive)
-        (message "%s" (format-mode-line mode-line-format)))
-
-      (defun jao--set-inactive-face (x frame)
-        (unless (eq x (face-attribute 'mode-line-inactive :height frame))
-          (set-face-attribute 'mode-line-inactive frame :height x)))
-
-      (defun jao--hide-inactive-mode-line (frame)
-        (jao--set-inactive-face 1 frame))
-
-      (defun jao--show-inactive-mode-line (frame)
-        (jao--set-inactive-face 'unspecified frame))
-
-      (when (and window-system (not jao-modeline-in-minibuffer-p))
-        (add-hook 'after-init-hook #'jao-toggle-inactive-mode-line)
-        (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)
-      (global-set-key (kbd "<insert>") #'jao-echo-mode-line)
-
+      (use-package jao-mode-line
+        :init
+        (when (and window-system (not jao-modeline-in-minibuffer))
+          (add-to-list 'after-make-frame-functions #'jao-mode-line-hide-inactive)
+          (add-hook 'after-init-hook #'jao-toggle-inactive-mode-line))
+        :bind (("<home>" . jao-mode-line-toggle-inactive)
+               ("<end>" . jao-mode-line-toggle)
+               ("<insert>" . jao-mode-line-echo)))
     #+end_src
 *** Diminish
     #+BEGIN_SRC emacs-lisp
@@ -790,7 +763,7 @@
                     battery-mode-line-format " %b%p ")) ;; " 🔋%b%p "
       (display-battery-mode 1)
       (with-eval-after-load "jao-minibuffer"
-        (unless jao-modeline-in-minibuffer-p
+        (unless jao-modeline-in-minibuffer
           (jao-minibuffer-add-variable 'battery-mode-line-string 80)))
     #+end_src
 * Notifications
@@ -1283,10 +1256,10 @@
 
       (defun jao-afio--set-mode-line ()
         (if (string= "Docs" (jao-afio-current-frame))
-            (jao--show-inactive-mode-line nil)
-          (jao--hide-inactive-mode-line nil)))
+            (jao-mode-line-show-inactive nil)
+          (jao-mode-line-hide-inactive nil)))
 
-      (unless jao-modeline-in-minibuffer-p
+      (unless jao-modeline-in-minibuffer
         (add-hook 'jao-afio-switch-hook #'jao-afio--set-mode-line))
     #+end_src
 * Writing and writing modes
@@ -2981,7 +2954,7 @@
       (defalias 'jao-streaming-volume-down #'jao-mpris-vol-down)
 
       (jao-mpris-register "playerctld"
-                          :session (if jao-modeline-in-minibuffer-p -10 70))
+                          :session (if jao-modeline-in-minibuffer -10 70))
 
     #+end_src
 *** mpc
@@ -2992,7 +2965,7 @@
 
       ;; (defvar jao-mopidy-port 6669)
       (defvar jao-mopidy-port nil)
-      (jao-mpc-setup jao-mopidy-port (if jao-modeline-in-minibuffer-p -10 70))
+      (jao-mpc-setup jao-mopidy-port (if jao-modeline-in-minibuffer -10 70))
 
       (defun jao-mpc-pport ()
         (when (jao-mpc--playing-p jao-mopidy-port) jao-mopidy-port))