Trim information displayed by mode-line-position

1 files changed, 12 insertions, 30 deletions

diff --git a/.config/emacs/modules/bd--modeline.el b/.config/emacs/modules/bd--modeline.el
index 9adafa0..baa1751 100644
--- a/.config/emacs/modules/bd--modeline.el
+++ b/.config/emacs/modules/bd--modeline.el
@@ -5,16 +5,6 @@
 ;;; Code:
 
 
-(defun mode-line-fill (reserve)
-  "Return empty space, leaving RESERVE space on the right."
-  (unless reserve
-    (setq reserve 20))
-  (when (and window-system (eq 'right (get-scroll-bar-mode)))
-    (setq reserve (- reserve 3)))
-  (propertize " "
-              'display `((space :align-to (- (+ right right-fringe right-margin) ,reserve)))))
-
-
 ;;;; remove mode-line-clutter
 (define-minor-mode minor-mode-blackout-mode
   "Hides minor modes from the mode line."
@@ -34,41 +24,39 @@
 
 
 (defvar-local bd/buffer-identification-mode-line
-    '(:eval (format "%s" (buffer-name)))
+    '(:eval (format "%s " (propertize (buffer-name) 'face 'shadow)))
   "Formats the modeline-buffer-name.")
 
 (defvar-local bd/modeline-buffer-file-state-icon
     '(:eval
       (cond (buffer-read-only
-             (propertize "L" 'face `(:foreground ,(ef-themes-get-color-value 'warning))))
+             (propertize " L " 'face `(:foreground ,(ef-themes-get-color-value 'warning))))
             ((and buffer-file-name (buffer-modified-p))
-             (propertize "S" 'face `(:foreground ,(ef-themes-get-color-value 'warning))))
+             (propertize " S " 'face `(:foreground ,(ef-themes-get-color-value 'warning))))
             ((and buffer-file-name
                   ;; Avoid freezing while connection is lost
                   (not (file-remote-p buffer-file-name))
                   (not (file-exists-p buffer-file-name)))
-             (propertize "?" 'face `(:foreground ,(ef-themes-get-color-value 'err))))
+             (propertize " ? " 'face `(:foreground ,(ef-themes-get-color-value 'err))))
             (t "")))
   "Formats the file modification status.")
 
 ;;;; pos
+(column-number-mode)
+(setopt mode-line-position-column-line-format '(" %l:%c "))
 (defvar-local bd/line-position
     '(:eval
       (when (mode-line-window-selected-p)
-        mode-line-position)))
-;; show column number
-(column-number-mode)
+        ;; remove the percentage
+        (cdr mode-line-position))))
 
 ;;;; git
 (defun git-vc-modeline ()
-  (let ((branch (mapconcat 'concat (cdr (split-string vc-mode "[:-]")) "-")))
-    (concat
-     (propertize (format " %s" branch))
-     (propertize "  "))))
+  (mapconcat 'concat (cdr (split-string vc-mode "[:-]")) "-"))
 
 (defvar-local bd/vc-mode-line
-    '(:eval (when (and vc-mode (not (eq major-mode 'magit-status-mode))) ; temp fix to avoid bug which occurs in magit buffer
-              (format "%s"
+    '(:eval (when (and vc-mode (not (eq major-mode 'magit-status-mode))) ; fix to avoid bug which occurs in magit buffer (don't remember)
+              (format " %s "
                       (propertize (git-vc-modeline) 'face 'shadow))))
   "Formats the checked out git repository.")
 
@@ -84,17 +72,11 @@
 (setq-default header-line-format
               (list
                mode-line-front-space
-               ;; mode-line-mule-info
-               ;; mode-line-frame-identification
                bd/buffer-identification-mode-line
-               " "
                mode-line-modes
                bd/modeline-buffer-file-state-icon
                bd/vc-mode-line
-               "      "
-               (mode-line-fill 16)
-               bd/line-position
-               "  "))
+               bd/line-position))
 (setq-default mode-line-format nil)