From 54bc32359a42969ae74ddc7753a988c2c68a3870 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Wed, 20 Nov 2019 22:09:18 +0800 Subject: [PATCH] Add vcs mode-line. --- doom-modeline-segments.el | 17 +++++++---------- doom-modeline.el | 13 +++++++++++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/doom-modeline-segments.el b/doom-modeline-segments.el index 63db2a4..e695aa9 100644 --- a/doom-modeline-segments.el +++ b/doom-modeline-segments.el @@ -271,13 +271,11 @@ Uses `all-the-icons-material' to fetch the icon." (cond (buffer-read-only (doom-modeline-buffer-file-state-icon "lock" "🔒" "%1*" 'doom-modeline-warning)) - ((and buffer-file-name - (buffer-modified-p) + ((and buffer-file-name (buffer-modified-p) doom-modeline-buffer-modification-icon) (doom-modeline-buffer-file-state-icon "save" "💾" "%1*" 'doom-modeline-buffer-modified)) - ((and buffer-file-name - (not (file-exists-p buffer-file-name))) + ((and buffer-file-name (not (file-exists-p buffer-file-name))) (doom-modeline-buffer-file-state-icon "do_not_disturb_alt" "🚫" "!" 'doom-modeline-urgent)) ((or (buffer-narrowed-p) @@ -439,12 +437,11 @@ directory, the file name, and its state (modified, read-only or non-existent)." (doom-modeline-def-segment buffer-info-simple "Display only the current buffer's name, but with fontification." - (propertize - " %b " - 'face (cond ((and buffer-file-name (buffer-modified-p)) - 'doom-modeline-buffer-modified) - ((doom-modeline--active) 'doom-modeline-buffer-file) - (t 'mode-line-inactive)))) + (propertize" %b " + 'face (cond ((and buffer-file-name (buffer-modified-p)) + 'doom-modeline-buffer-modified) + ((doom-modeline--active) 'doom-modeline-buffer-file) + (t 'mode-line-inactive)))) ;; diff --git a/doom-modeline.el b/doom-modeline.el index 1f690b0..05b5c87 100644 --- a/doom-modeline.el +++ b/doom-modeline.el @@ -104,6 +104,10 @@ '(bar window-number buffer-default-directory) '(misc-info battery irc mu4e github debug major-mode process)) +(doom-modeline-def-modeline 'vcs + '(bar window-number modals matches buffer-info buffer-position parrot selection-info) + '(misc-info battery irc mu4e github debug minor-modes buffer-encoding major-mode process)) + (doom-modeline-def-modeline 'package '(bar window-number package) '(misc-info major-mode process)) @@ -159,6 +163,11 @@ If DEFAULT is non-nil, set the default mode-line for all buffers." "Set project mode-line." (doom-modeline-set-modeline 'project)) +;;;###autoload +(defun doom-modeline-set-vcs-modeline () + "Set vcs mode-line." + (doom-modeline-set-modeline 'vcs)) + ;;;###autoload (defun doom-modeline-set-info-modeline () "Set Info mode-line." @@ -222,9 +231,9 @@ If DEFAULT is non-nil, set the default mode-line for all buffers." ;; Add hooks (add-hook 'Info-mode-hook #'doom-modeline-set-info-modeline) (add-hook 'dired-mode-hook #'doom-modeline-set-project-modeline) - (add-hook 'magit-mode-hook #'doom-modeline-set-project-modeline) (add-hook 'dashboard-mode-hook #'doom-modeline-set-project-modeline) (add-hook 'image-mode-hook #'doom-modeline-set-media-modeline) + (add-hook 'magit-mode-hook #'doom-modeline-set-vcs-modeline) (add-hook 'circe-mode-hook #'doom-modeline-set-special-modeline) (add-hook 'erc-mode-hook #'doom-modeline-set-special-modeline) (add-hook 'rcirc-mode-hook #'doom-modeline-set-special-modeline) @@ -243,9 +252,9 @@ If DEFAULT is non-nil, set the default mode-line for all buffers." ;; Remove hooks (remove-hook 'Info-mode-hook #'doom-modeline-set-info-modeline) (remove-hook 'dired-mode-hook #'doom-modeline-set-project-modeline) - (remove-hook 'magit-mode-hook #'doom-modeline-set-project-modeline) (remove-hook 'dashboard-mode-hook #'doom-modeline-set-project-modeline) (remove-hook 'image-mode-hook #'doom-modeline-set-media-modeline) + (remove-hook 'magit-mode-hook #'doom-modeline-set-vcs-modeline) (remove-hook 'circe-mode-hook #'doom-modeline-set-special-modeline) (remove-hook 'erc-mode-hook #'doom-modeline-set-special-modeline) (remove-hook 'rcirc-mode-hook #'doom-modeline-set-special-modeline)