hiro/doom-modeline
1
0
Fork 0
mirror of https://github.com/vale981/doom-modeline synced 2025-03-05 09:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change doom-modeline-evil-state-icon to doom-modeline-modal-icon.

Browse source 
See #265.
This commit is contained in:
Vincent Zhang 2019-11-22 18:33:21 +08:00
parent c70bb0c39d
commit d6165e6f3c
3 changed files with 50 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -253,8 +253,9 @@ Run `M-x customize-group RET doom-modeline RET` or set the variables.
;; The interval of checking GitHub. ;; The interval of checking GitHub.
(setq doom-modeline-github-interval (* 30 60)) (setq doom-modeline-github-interval (* 30 60))
;; Whether display the `evil' state icon. ;; Whether display the modal state icon.
(setq doom-modeline-evil-state-icon t) ;; Including `evil', `overwrite', `god', `ryo' and `xah-fly-keys', etc.
(setq doom-modeline-modal-icon t)
;; Whether display the mu4e notifications. It requires `mu4e-alert' package. ;; Whether display the mu4e notifications. It requires `mu4e-alert' package.
(setq doom-modeline-mu4e t) (setq doom-modeline-mu4e t)

6
doom-modeline-core.el
View file

@ -309,8 +309,10 @@ It requires `ghub' and `async' packages."
:type 'boolean :type 'boolean
:group 'doom-modeline) :group 'doom-modeline)
(defcustom doom-modeline-evil-state-icon t (defcustom doom-modeline-modal-icon t
"Whether display the `evil' state icon." "Whether display the modal state icon.
Including `evil', `overwrite', `god', `ryo' and `xah-fly-keys', etc."
:type 'boolean :type 'boolean
:group 'doom-modeline) :group 'doom-modeline)

70
doom-modeline-segments.el
View file

@ -1530,7 +1530,7 @@ mouse-1: Display Line and Column Mode Menu"
(doom-modeline-spc) (doom-modeline-spc)
(doom-modeline-icon (doom-modeline-icon
'material 'material
(when doom-modeline-evil-state-icon "fiber_manual_record") (when doom-modeline-modal-icon "fiber_manual_record")
"●" "●"
(string-trim (evil-state-property evil-state :tag t)) (string-trim (evil-state-property evil-state :tag t))
(if (doom-modeline--active) (if (doom-modeline--active)
@ -1553,11 +1553,14 @@ mouse-1: Display Line and Column Mode Menu"
(not (bound-and-true-p evil-local-mode))) (not (bound-and-true-p evil-local-mode)))
(propertize (concat (propertize (concat
(doom-modeline-spc) (doom-modeline-spc)
(doom-modeline-icon 'material "fiber_manual_record" "●" "<O>" (doom-modeline-icon
(if (doom-modeline--active) 'material
'doom-modeline-urgent (when doom-modeline-modal-icon "fiber_manual_record")
'mode-line-inactive) "●" "<O>"
:v-adjust -0.225) (if (doom-modeline--active)
'doom-modeline-urgent
'mode-line-inactive)
:v-adjust -0.225)
(doom-modeline-spc)) (doom-modeline-spc))
'help-echo "Overwrite state"))) 'help-echo "Overwrite state")))
@ -1566,11 +1569,14 @@ mouse-1: Display Line and Column Mode Menu"
(when (bound-and-true-p god-local-mode) (when (bound-and-true-p god-local-mode)
(propertize (concat (propertize (concat
(doom-modeline-spc) (doom-modeline-spc)
(doom-modeline-icon 'material "fiber_manual_record" "●" "<G>" (doom-modeline-icon
(if (doom-modeline--active) 'material
'doom-modeline-evil-normal-state (when doom-modeline-modal-icon "fiber_manual_record")
'mode-line-inactive) "●" "<G>"
:v-adjust -0.225) (if (doom-modeline--active)
'doom-modeline-evil-normal-state
'mode-line-inactive)
:v-adjust -0.225)
(doom-modeline-spc)) (doom-modeline-spc))
'help-echo "God mode"))) 'help-echo "God mode")))
@ -1579,11 +1585,14 @@ mouse-1: Display Line and Column Mode Menu"
(when (bound-and-true-p ryo-modal-mode) (when (bound-and-true-p ryo-modal-mode)
(propertize (concat (propertize (concat
(doom-modeline-spc) (doom-modeline-spc)
(doom-modeline-icon 'material "fiber_manual_record" "●" "<R>" (doom-modeline-icon
(if (doom-modeline--active) 'material
'doom-modeline-evil-normal-state (when doom-modeline-modal-icon "fiber_manual_record")
'mode-line-inactive) "●" "<R>"
:v-adjust -0.225) (if (doom-modeline--active)
'doom-modeline-evil-normal-state
'mode-line-inactive)
:v-adjust -0.225)
(doom-modeline-spc)) (doom-modeline-spc))
'help-echo "Ryo modal"))) 'help-echo "Ryo modal")))
@ -1594,25 +1603,32 @@ mouse-1: Display Line and Column Mode Menu"
(if xah-fly-insert-state-q (if xah-fly-insert-state-q
(propertize (concat (propertize (concat
(doom-modeline-spc) (doom-modeline-spc)
(doom-modeline-icon 'material "fiber_manual_record" "●" "<I>" (doom-modeline-icon
(if active 'material
'doom-modeline-evil-insert-state (when doom-modeline-modal-icon "fiber_manual_record")
'mode-line-inactive) "●" "<I>"
:v-adjust -0.225) (if active
'doom-modeline-evil-insert-state
'mode-line-inactive)
:v-adjust -0.225)
(doom-modeline-spc)) (doom-modeline-spc))
'help-echo "Xah-fly insert state") 'help-echo "Xah-fly insert state")
(propertize (concat (propertize (concat
(doom-modeline-spc) (doom-modeline-spc)
(doom-modeline-icon 'material "fiber_manual_record" "●" "<C>" (doom-modeline-icon
(if active 'material
'doom-modeline-evil-normal-state (when doom-modeline-modal-icon "fiber_manual_record")
'mode-line-inactive) "●" "<X>"
:v-adjust -0.225) (if active
'doom-modeline-evil-normal-state
'mode-line-inactive)
:v-adjust -0.225)
(doom-modeline-spc)) (doom-modeline-spc))
'help-echo "Xah-fly normal state"))))) 'help-echo "Xah-fly normal state")))))
(doom-modeline-def-segment modals (doom-modeline-def-segment modals
"Displays modal editing states, including `evil', `overwrite', `god', `ryo' and `xha-fly-kyes', etc." "Displays modal editing states, including `evil', `overwrite', `god', `ryo'
and `xha-fly-kyes', etc."
(concat (doom-modeline--evil) (concat (doom-modeline--evil)
(doom-modeline--overwrite) (doom-modeline--overwrite)
(doom-modeline--god) (doom-modeline--god)