Something close to correct for EXWM+workspaces+statusbar

1 files changed, 3 insertions, 20 deletions

diff --git a/emacs/inits/02-modeline.el b/emacs/inits/02-modeline.el
index 9df8889..e4fef10 100644
--- a/emacs/inits/02-modeline.el
+++ b/emacs/inits/02-modeline.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2020-04-26 20:33:20 (tslil@bison)>
+;; Time-stamp: <2020-05-05 20:25:50 (tslil@bison)>
 
 ;; -----------------------------------------------------------------------------
 ;; Mode-line
@@ -26,21 +26,7 @@
 ;; indicator in a posfrmae as provided by statusbar.el. Othewrise, use
 ;; minibuffer-line as the central location.
 
-(if (fboundp 'exwm-systemtray-enable)
-    (progn
-      ;; -----------------------------------------------------------------------------
-      ;; Statusbar.el
-      (add-to-list 'load-path (expand-file-name "~/.emacs.d/scripts/statusbar.el/"))
-      (use-package posframe :ensure t)
-      (use-package statusbar
-        :config
-        (advice-add 'exwm-update-workspace-lighter :after #'statusbar-refresh)
-        (setq statusbar-modeline-variables '(exwm-workspace-lighter display-time-string))
-        (statusbar-mode 1)
-        (exwm-update-workspace-lighter)))
-  ;; -----------------------------------------------------------------------------
-  ;; Not running under EXWM, use minibuffer-line
-  ;;
+(unless (fboundp 'exwm-systemtray-enable)
   ;; First we define two ``modules'' for use in the mode-line
 
   ;; -----------------------------------------------------------------------------
@@ -98,10 +84,7 @@
         (insert (format-mode-line minibuffer-line-format 'minibuffer-line))
         (setq fill-column (frame-width))
         (center-line)))
-    (minibuffer-line-mode 1)
-
-    (when (symbolp exwm-workspace-switch-hook)
-      (push #'minibuffer-line--update exwm-workspace-switch-hook)))
+    (minibuffer-line-mode 1))
   ;; really want to hook buffer changes at all, and focus
   (add-hook 'minibuffer-exit-hook #'minibuffer-line--update))