mirror of
https://github.com/correl/doom-modeline.git
synced 2024-11-27 11:09:52 +00:00
Refactor.
This commit is contained in:
parent
55269e7288
commit
f281bd872f
1 changed files with 24 additions and 24 deletions
|
@ -120,16 +120,16 @@
|
||||||
((error "%s is not a valid segment" seg))))
|
((error "%s is not a valid segment" seg))))
|
||||||
(nreverse forms)))
|
(nreverse forms)))
|
||||||
|
|
||||||
(defmacro doom-modeline-def (name lhs &optional rhs)
|
(defmacro doom-modeline-def-modeline (name lhs &optional rhs)
|
||||||
"Defines a modeline format and byte-compiles it.
|
"Defines a modeline format and byte-compiles it.
|
||||||
NAME is a symbol to identify it (used by `doom-modeline' for retrieval).
|
NAME is a symbol to identify it (used by `doom-modeline' for retrieval).
|
||||||
LHS and RHS are lists of symbols of modeline segments defined with
|
LHS and RHS are lists of symbols of modeline segments defined with
|
||||||
`doom-modeline-def-segment'.
|
`doom-modeline-def-segment'.
|
||||||
Example:
|
Example:
|
||||||
(doom-modeline-def minimal
|
(doom-modeline-def-modeline minimal
|
||||||
(bar matches \" \" buffer-info)
|
(bar matches \" \" buffer-info)
|
||||||
(media-info major-mode))
|
(media-info major-mode))
|
||||||
(doom-modeline-set 'minimal t)"
|
(doom-modeline-set-modeline 'minimal t)"
|
||||||
(let ((sym (intern (format "doom-modeline-format--%s" name)))
|
(let ((sym (intern (format "doom-modeline-format--%s" name)))
|
||||||
(lhs-forms (doom-modeline--prepare-segments lhs))
|
(lhs-forms (doom-modeline--prepare-segments lhs))
|
||||||
(rhs-forms (doom-modeline--prepare-segments rhs)))
|
(rhs-forms (doom-modeline--prepare-segments rhs)))
|
||||||
|
@ -160,7 +160,7 @@ Throws an error if it doesn't exist."
|
||||||
(when (functionp fn)
|
(when (functionp fn)
|
||||||
`(:eval (,fn)))))
|
`(:eval (,fn)))))
|
||||||
|
|
||||||
(defun doom-modeline-set (key &optional default)
|
(defun doom-modeline-set-modeline (key &optional default)
|
||||||
"Set the modeline format. Does nothing if the modeline KEY doesn't exist.
|
"Set the modeline format. Does nothing if the modeline KEY doesn't exist.
|
||||||
If DEFAULT is non-nil, set the default mode-line for all buffers."
|
If DEFAULT is non-nil, set the default mode-line for all buffers."
|
||||||
(when-let ((modeline (doom-modeline key)))
|
(when-let ((modeline (doom-modeline key)))
|
||||||
|
@ -876,25 +876,25 @@ enabled."
|
||||||
;; Mode lines
|
;; Mode lines
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(doom-modeline-def main
|
(doom-modeline-def-modeline main
|
||||||
(workspace-number bar matches " " buffer-info " %l:%c %p " selection-info)
|
(workspace-number bar matches " " buffer-info " %l:%c %p " selection-info)
|
||||||
(buffer-encoding major-mode vcs flycheck))
|
(buffer-encoding major-mode vcs flycheck))
|
||||||
|
|
||||||
(doom-modeline-def minimal
|
(doom-modeline-def-modeline minimal
|
||||||
(bar matches " " buffer-info)
|
(bar matches " " buffer-info)
|
||||||
(media-info major-mode))
|
(media-info major-mode))
|
||||||
|
|
||||||
(doom-modeline-def special
|
(doom-modeline-def-modeline special
|
||||||
(bar matches " " buffer-info-simple " %l:%c %p " selection-info)
|
(bar matches " " buffer-info-simple " %l:%c %p " selection-info)
|
||||||
(buffer-encoding major-mode flycheck))
|
(buffer-encoding major-mode flycheck))
|
||||||
|
|
||||||
(doom-modeline-def project
|
(doom-modeline-def-modeline project
|
||||||
(bar buffer-default-directory)
|
(bar buffer-default-directory)
|
||||||
(major-mode))
|
(major-mode))
|
||||||
|
|
||||||
(doom-modeline-def media
|
(doom-modeline-def-modeline media
|
||||||
(bar " %b ")
|
(bar " %b ")
|
||||||
(media-info major-mode))
|
(media-info major-mode))
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Hooks
|
;; Hooks
|
||||||
|
@ -921,25 +921,25 @@ enabled."
|
||||||
;; of Emacs, someone give the man a modeline!
|
;; of Emacs, someone give the man a modeline!
|
||||||
(dolist (bname '("*scratch*" "*Messages*"))
|
(dolist (bname '("*scratch*" "*Messages*"))
|
||||||
(with-current-buffer bname
|
(with-current-buffer bname
|
||||||
(doom-modeline-set 'main)))))
|
(doom-modeline-set-modeline 'main)))))
|
||||||
|
|
||||||
(defun doom-modeline-set-special-modeline ()
|
(defun doom-modeline-set-special-modeline ()
|
||||||
"Set sepcial mode-line."
|
"Set sepcial mode-line."
|
||||||
(doom-modeline-set 'special))
|
(doom-modeline-set-modeline 'special))
|
||||||
|
|
||||||
(defun doom-modeline-set-media-modeline ()
|
(defun doom-modeline-set-media-modeline ()
|
||||||
"Set media mode-line."
|
"Set media mode-line."
|
||||||
(doom-modeline-set 'media))
|
(doom-modeline-set-modeline 'media))
|
||||||
|
|
||||||
(defun doom-modeline-set-project-modeline ()
|
(defun doom-modeline-set-project-modeline ()
|
||||||
"Set project mode-line."
|
"Set project mode-line."
|
||||||
(doom-modeline-set 'project))
|
(doom-modeline-set-modeline 'project))
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Bootstrap
|
;; Bootstrap
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(doom-modeline-set 'main t) ; set default modeline
|
(doom-modeline-set-modeline 'main t) ; set default modeline
|
||||||
|
|
||||||
;; (add-hook 'doom-load-theme-hook #'doom-modeline-init)
|
;; (add-hook 'doom-load-theme-hook #'doom-modeline-init)
|
||||||
;; (add-hook 'doom-scratch-buffer-hook #'doom-modeline-set-special-modeline)
|
;; (add-hook 'doom-scratch-buffer-hook #'doom-modeline-set-special-modeline)
|
||||||
|
|
Loading…
Reference in a new issue