jao-minibuffer: better mode-line in minibuffer

1 files changed, 14 insertions, 13 deletions

diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el
index 1b64a31..599a333 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -84,19 +84,21 @@
                   "   " msg)))))
 
 (defun jao-minibuffer--insert (msg)
-  (save-window-excursion
-    (with-current-buffer jao-minibuffer--name
-      (erase-buffer)
-      (insert msg))))
+  (with-current-buffer jao-minibuffer--name
+    (erase-buffer)
+    (insert msg)))
 
 (defvar jao-minibuffer--mode-line-format
-  '("%1+%n %o (%2l,%2c) " ;; %z
-    (:propertize " %[%b%] " face mode-line-buffer-id)
-    " ("
+  '((:propertize " %[%b%]" face mode-line-buffer-id)
+    (:propertize
+     (circe-chat-target (:eval (format " [%d] " (length (circe-channel-nicks))))
+                        " ")
+     face jao-themes-dimm)
+    "%+ "
     (:propertize mode-name face jao-themes-f00)
-    (:propertize ("" minor-mode-alist (vc-mode vc-mode)) face jao-themes-dimm)
-    ")"
-    mode-line-misc-info))
+    (:propertize ("" minor-mode-alist (vc-mode vc-mode)) face jao-themes-f11)
+    (:propertize ("%n L%l " (-3 "%P")) face jao-themes-f12)
+    global-mode-string))
 
 ;;;###autoload
 (defun jao-minibuffer-refresh (&rest _ignore)
@@ -106,7 +108,7 @@
 
 ;;;###autoload
 (defun jao-minibuffer-add-variable (variable-name &optional order)
-  (let ((v (if (symbolp variable-name) `(:eval ,variable-name) variable-name)))
+  (let ((v `(:eval ,variable-name)))
     (setq jao-minibuffer-info (remove v jao-minibuffer-info))
     (add-to-ordered-list 'jao-minibuffer-info v order)))
 
@@ -118,6 +120,7 @@
   (set-face-attribute 'mode-line-inactive nil
                       :box nil :height 1 :background "grey90")
   (advice-add 'force-mode-line-update :after #'jao-minibuffer-refresh)
+  (add-hook 'buffer-list-update-hook #'jao-minibuffer-refresh)
   (jao-minibuffer-add-variable 'jao-minibuffer--mode-line-format order))
 
 (defvar jao-minibuffer--notification-timer nil)
@@ -154,7 +157,5 @@
 (setq set-message-function #'jao-minibuffer--set-message)
 (setq clear-message-function #'jao-minibuffer-refresh)
 
-(setq resize-mini-windows nil)
-
 (provide 'jao-minibuffer)
 ;;; jao-minibuffer.el ends here