1 files changed, 28 insertions, 29 deletions

@@ -668,35 +668,34 @@
   ;; TODO: +display-time-mode with MOAR customizations
   (:option display-time-default-load-average nil
            display-time-mail-file :disable)
-  (with-eval-after-load 'discord
-    (with-eval-after-load '+tab-bar
-      (:option display-time-string-forms
-               '((propertize (format-time-string "%H:%M %a %e" now)
-                             'face '+tab-bar-extra
-                             'help-echo (discord-date-string))
-                 load
-                 (if mail
-                     (concat " "
-                             (propertize
-                              display-time-mail-string
-                              'display `(when (and display-time-use-mail-icon
-                                                   (display-graphic-p))
-                                          ,@display-time-mail-icon
-                                          ,@(when (and
-                                                   display-time-mail-face
-                                                   (memq
-                                                    (plist-get
-                                                     (cdr display-time-mail-icon)
-                                                     :type)
-                                                    '(pbm xbm)))
-                                              (let ((bg (face-attribute
-                                                         display-time-mail-face
-                                                         :background)))
-                                                (when (stringp bg)
-                                                  (list :background bg)))))
-                              'face display-time-mail-face))
-                   "")
-                 " "))))
+  (:require discord +tab-bar)           ; Require instead of eval after load
+  (:option display-time-string-forms
+           '((propertize (format-time-string "%H:%M %a %e" now)
+                         'face '+tab-bar-extra
+                         'help-echo (discord-date-string))
+             load
+             (if mail
+                 (concat " "
+                         (propertize
+                          display-time-mail-string
+                          'display `(when (and display-time-use-mail-icon
+                                               (display-graphic-p))
+                                      ,@display-time-mail-icon
+                                      ,@(when (and
+                                               display-time-mail-face
+                                               (memq
+                                                (plist-get
+                                                 (cdr display-time-mail-icon)
+                                                 :type)
+                                                '(pbm xbm)))
+                                          (let ((bg (face-attribute
+                                                     display-time-mail-face
+                                                     :background)))
+                                            (when (stringp bg)
+                                              (list :background bg)))))
+                          'face display-time-mail-face))
+               "")
+             " "))
 
   (display-time-mode +1))