mode-line in minibuffer everywheremain

1 files changed, 16 insertions, 10 deletions

diff --git a/init.el b/init.el
index eb245da..f694359 100644
--- a/init.el
+++ b/init.el
@@ -491,13 +491,16 @@
   (if (jao-colors-scheme-dark-p)
       (setq jao-minibuffer-active-buffer-line-color "azure4"
             jao-minibuffer-inactive-buffer-line-color "grey25")
-    (setq jao-minibuffer-active-buffer-line-color "burlywood3"
-          jao-minibuffer-inactive-buffer-line-color "grey65"))
-  (setq jao-minibuffer-adaptive-alignment nil)
+    (setq jao-minibuffer-active-buffer-line-color
+          (jao-d-l "#cfcfcf" "burlywood3")
+          jao-minibuffer-inactive-buffer-line-color
+          (jao-d-l "#dfdfdf" "grey65")))
+  (setq jao-minibuffer-adaptive-alignment nil
+        jao-minibuffer-info-face-alt 'jao-themes-dimm)
   :commands (jao-minibuffer-add-variable
              jao-minibuffer-refresh
              jao-minibuffer-mode
-	     jao-minibuffer-mode-line-mode))
+             jao-minibuffer-mode-line-mode))
 
 (setq enable-recursive-minibuffers t)
 (require 'mb-depth)
@@ -550,10 +553,9 @@
                                  (seconds-to-time (/ v 1000.0))))))
 
 ;;;; mode line toggle
-(defvar jao-mode-line-in-minibuffer (jao-is-linux))
+(defvar jao-mode-line-in-minibuffer (display-graphic-p))
 
 (use-package jao-mode-line
-  :if (jao-is-linux)
   :commands (jao-mode-line-add-to-minibuffer-left
              jao-mode-line-add-to-minibuffer-right
              jao-mode-line-remove-from-minibuffer)
@@ -1119,9 +1121,10 @@
    (menu-bar . nil)
    ,@(jao-when-darwin '((internal-border-width . 5)
                         (width . 163)
-                        (height . 70)
-                        (right-divider-width . 6)
-                        (bottom-divider-width . 6)))))
+                        (height . 63)
+                        ;; (right-divider-width . 6)
+                        ;; (bottom-divider-width . 6)
+                        ))))
 
 ;;;; frame layout, title, etc
 (setq frame-title-format '("%b - emacs"))
@@ -1776,7 +1779,10 @@
  (defun jao-wayland-enabled-p () nil)
  (defun jao-river-enabled-p () nil))
 
-(jao-when-linux (require 'jao-custom-x11))
+(jao-d-l
+ (setq jao-minibuffer-info-face 'jao-themes-dimm)
+ (jao-mode-line-add-to-minibuffer-left 90)
+ (require 'jao-custom-x11))
 
 ;;; Global transients
 (defun jao-list-packages ()