using minibuffer for displaying time

1 files changed, 38 insertions, 33 deletions

diff --git a/init.org b/init.org
index b020a42..551a9ec 100644
--- a/init.org
+++ b/init.org
@@ -621,35 +621,8 @@
             selection-timeout 100)
     #+END_SRC
 * 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)
-            (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"))
-        :commands (jao-minibuffer-add-variable
-		   jao-minibuffer-refresh
-		   jao-minibuffer-add-mode-line
-                   jao-minibuffer-mode))
-
-      (setq enable-recursive-minibuffers t)
-      (require 'mb-depth)
-      (minibuffer-depth-indicate-mode 1)
-      (require 'minibuf-eldef)
-      (setq minibuffer-eldef-shorten-default t)
-      (minibuffer-electric-default-mode 1)
-
-      (jao-minibuffer-mode 1)
-      (when jao-modeline-in-minibuffer-p
-        (jao-minibuffer-add-mode-line 90))
-    #+end_src
 *** Time display
-    #+BEGIN_SRC emacs-lisp
+    #+begin_src emacs-lisp
       (setq display-time-world-list
             '(("Europe/Paris" "Barcelona")
               ("America/Los_Angeles" "Los Angeles")
@@ -695,13 +668,45 @@
           (message "%s = %s" v
                    (format-time-string "%Y-%m-%d %H:%M:%S"
                                        (seconds-to-time (/ v 1000.0))))))
-    #+END_SRC
-*** Mode line format
+
+      (setq display-time-day-and-date nil
+            display-time-24hr-format nil
+            display-time-default-load-average nil
+            display-time-format " %a %e %H:%M")
+
+    #+end_src
+*** Minibuffer
     #+begin_src emacs-lisp
-      (setq line-number-display-limit-width 250
-            display-time-string-forms '(24-hours ":" minutes))
-      (display-time-mode -1)
+      (defvar jao-modeline-in-minibuffer-p t)
+
+      (use-package jao-minibuffer
+        :init
+        (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"))
+        :commands (jao-minibuffer-add-variable
+		   jao-minibuffer-refresh
+		   jao-minibuffer-add-mode-line
+                   jao-minibuffer-mode))
 
+      (setq enable-recursive-minibuffers t)
+      (require 'mb-depth)
+      (minibuffer-depth-indicate-mode 1)
+      (require 'minibuf-eldef)
+      (setq minibuffer-eldef-shorten-default t)
+      (minibuffer-electric-default-mode 1)
+
+      (jao-minibuffer-mode 1)
+      (when jao-modeline-in-minibuffer-p
+        (display-time-mode 1)
+        (add-hook 'display-time-hook #'jao-minibuffer-refresh)
+        (jao-minibuffer-add-mode-line 90))
+    #+end_src
+*** Mode line format
+    #+begin_src emacs-lisp
+      (setq line-number-display-limit-width 250)
       (setq mode-line-position-column-format '(" %c")
             mode-line-position-line-format '(" %l,%c"))
       (setq mode-line-percent-position