Further configure the mode line

I've broken out extra functions into `acdw-modeline', so they don't clutter up
the init.el too much.

1 files changed, 8 insertions, 48 deletions

@@ -302,63 +302,23 @@
 ;;; Mode line
 
 ;; Minions
-(acdw/pkg minions
-  :now ((minions-mode +1)))
+(acdw/pkg minions)
 
 ;; Simple mode line
 (acdw/pkg simple-modeline
   :set '((simple-modeline-segments
           ((;; left
-            acdw/modeline-modified
-            simple-modeline-segment-buffer-name
-            simple-modeline-segment-position)
+            acdw-modeline/modified
+            acdw-modeline/buffer-name
+            simple-modeline-segment-position
+            simple-modeline-segment-word-count)
            (;; right
-            simple-modeline-segment-vc
+            acdw-modeline/vc-branch
             simple-modeline-segment-misc-info
             simple-modeline-segment-process
-            acdw/modeline-minions
+            acdw-modeline/minions
             simple-modeline-segment-major-mode))))
-  :now ((defun acdw/modeline-modified ()
-          "Displays a color-coded buffer modification/read-only
-indicator in the mode-line."
-          (if (not (string-match-p "\\*.*\\*" (buffer-name)))
-              (let* ((read-only (and buffer-read-only (buffer-file-name)))
-                     (modified (buffer-modified-p)))
-                (propertize
-                 (if read-only " ×" (if modified " ●" " ○"))
-                 'face `(:inherit
-                         ,(if modified 'simple-modeline-status-modified
-                            (if read-only 'simple-modeline-status-error
-                              'simple-modeline-unimportant)))
-                 'help-echo (format
-                             (concat "Buffer is %s and %smodified\n"
-                                     "mouse-1: Toggle read-only status.")
-                             (if read-only "read-only" "writable")
-                             (if modified "" "not "))
-                 'local-map (purecopy (simple-modeline-make-mouse-map
-                                       'mouse-1
-                                       (lambda (event)
-                                         (interactive "e")
-                                         (with-selected-window
-                                             (posn-window (event-start event))
-                                           (read-only-mode 'toggle)))))
-                 'mouse-face 'mode-line-highlight))))
-        (defun acdw/modeline-minions ()
-          "Display a button for `minions-minor-modes-menu'."
-          (concat
-           " "
-           (propertize
-            "ⱷ"
-            'help-echo (format
-                        "Minor modes menu\nmouse-1: show menu.")
-            'local-map (purecopy (simple-modeline-make-mouse-map
-                                  'mouse-1
-                                  (lambda (event)
-                                    (interactive "e")
-                                    (with-selected-window (posn-window
-                                                           (event-start event))
-                                      (minions-minor-modes-menu)))))
-            'mouse-face 'mode-line-highlight)))
+  :now ((require 'acdw-modeline)
         (simple-modeline-mode +1)))
 
 ;;; Magit