Cleanup modeline

global.org

@@ -246,44 +246,30 @@
 
      (setq-default header-line-format nil);'("%e" ));wilder-buffer-vc-mode-line))
 
-     (defun simple-mode-line-render (left right)
-       "Return a string of `window-width' length containing LEFT, and RIGHT
-               aligned respectively."
-       (let* ((available-width (- (window-width) (length left) 2)))
-         (format (format " %%s %%%ds " available-width) left right)))
-
-     (defun mode-line-left-right (left right)
-       (let* ((len-left (length (format-mode-line left)))
-              (len-right (length (format-mode-line right)))
-              (len-separator (- (window-width) (+ len-left len-right 3)))
-              (separator (format (format "%%%ds" len-separator) "")))
-         (append left (list separator) right)))
-
-     (defvar mode-line-separator
-       (let* ((len-left (length (format-mode-line mode-line-format-left)))
-              (len-right (length (format-mode-line mode-line-format-right)))
-              (len-separator (- (window-width) (+ len-left len-right))))
-         (format (format "%%%ds" len-separator) "")))
-
-
-     (defvar mode-line-format-left
+     (setq mode-line-separator
+       '(:eval (let* ((len-left (length (format-mode-line mode-line-format-left)))
+                      (len-right (length (format-mode-line mode-line-format-right)))
+                      (len-separator (- (+ (window-width) 2 2 2) (+ len-left len-right))))
+                 (format (format "%%%ds" len-separator) ""))))
+
+     (setq mode-line-format-left
        '("%e"
          mode-line-front-space
          mode-line-front-space
          mode-line-front-space
-                                             ; mode-line-mule-info
+         ; mode-line-mule-info
          mode-line-modified
          mode-line-remote
          mode-line-frame-identification
          wilder-buffer-vc-mode-line
          "  "
-         wilder/mode-line-modes
-         mode-line-misc-info))
+         wilder-position))
 
-     (defvar mode-line-format-right
+     (setq mode-line-format-right
        '((:propertize " " face mode-line-indicator)
-         wilder-position
-         mode-line-end-spaces))
+         wilder/mode-line-modes
+         mode-line-misc-info
+         "   "))
 
      (put 'mode-line-format-left 'risky-local-variable t)
      (put 'mode-line-format-right 'risky-local-variable t)