emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite modeline config

Browse source
This commit is contained in:
Henrik Lissner 2016-09-23 16:08:52 +02:00
parent da0ffdc500
commit 328638d94b
1 changed files with 76 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

144
core/core-modeline.el
View file

@ -77,13 +77,6 @@ active.")
"?" "?"
(cdr-safe (assq state (flycheck-count-errors flycheck-current-errors)))))) (cdr-safe (assq state (flycheck-count-errors flycheck-current-errors))))))
(defun doom-ml-icon (icon-name face height)
(propertize (all-the-icons-octicon icon-name)
'face `(:inherit ,face
:family ,(all-the-icons-octicon-family)
:height ,height)
'display '(raise -0.06)))
;; pyenv/rbenv version segment ;; pyenv/rbenv version segment
(defvar doom-ml-env-version-hook '() (defvar doom-ml-env-version-hook '()
"Hook that runs whenever the environment version changes (e.g. rbenv/pyenv)") "Hook that runs whenever the environment version changes (e.g. rbenv/pyenv)")
@ -121,12 +114,12 @@ cached the first time."
(defvar-local doom-ml--env-command nil) (defvar-local doom-ml--env-command nil)
;; So the mode-line can keep track of "the current window" ;; So the mode-line can keep track of "the current window"
(defvar mode-line-selected-window nil) (defvar doom-ml-selected-window nil)
(defun doom|set-selected-window (&rest _) (defun doom|set-selected-window (&rest _)
(let ((window (frame-selected-window))) (let ((window (frame-selected-window)))
(when (and (windowp window) (when (and (windowp window)
(not (minibuffer-window-active-p window))) (not (minibuffer-window-active-p window)))
(setq mode-line-selected-window window)))) (setq doom-ml-selected-window window))))
(add-hook 'window-configuration-change-hook #'doom|set-selected-window) (add-hook 'window-configuration-change-hook #'doom|set-selected-window)
(add-hook 'focus-in-hook #'doom|set-selected-window) (add-hook 'focus-in-hook #'doom|set-selected-window)
(advice-add 'select-window :after 'doom|set-selected-window) (advice-add 'select-window :after 'doom|set-selected-window)
@ -141,7 +134,6 @@ cached the first time."
"Displays the buffer's full path relative to the project root (includes the "Displays the buffer's full path relative to the project root (includes the
project root). Excludes the file basename. See `*buffer-name' for that." project root). Excludes the file basename. See `*buffer-name' for that."
(when buffer-file-name (when buffer-file-name
(propertize
(f-dirname (f-dirname
(let ((buffer-path (file-relative-name buffer-file-name (projectile-project-root))) (let ((buffer-path (file-relative-name buffer-file-name (projectile-project-root)))
(max-length (truncate (/ (window-body-width) 1.75)))) (max-length (truncate (/ (window-body-width) 1.75))))
@ -159,8 +151,7 @@ project root). Excludes the file basename. See `*buffer-name' for that."
(when (string-suffix-p "/" output) (when (string-suffix-p "/" output)
(setq output (substring output 0 -1))) (setq output (substring output 0 -1)))
output) output)
buffer-path)))) buffer-path))))))
'face (if active 'doom-modeline-alternate))))
(defun *buffer-name () (defun *buffer-name ()
"The buffer's base name or id." "The buffer's base name or id."
@ -168,9 +159,10 @@ project root). Excludes the file basename. See `*buffer-name' for that."
(f-filename buffer-file-name) (f-filename buffer-file-name)
(s-trim-left (format-mode-line "%b")))) (s-trim-left (format-mode-line "%b"))))
(defun *buffer-pwd () (defun *buffer-project ()
"Displays `default-directory', for special buffers like the scratch buffer." "Displays `default-directory', for special buffers like the scratch buffer."
(concat (concat
" "
(all-the-icons-octicon (all-the-icons-octicon
"file-directory" "file-directory"
:face 'doom-modeline-alternate :v-adjust -0.05 :height 1.3) :face 'doom-modeline-alternate :v-adjust -0.05 :height 1.3)
@ -180,32 +172,54 @@ project root). Excludes the file basename. See `*buffer-name' for that."
(defun *buffer-state () (defun *buffer-state ()
"Displays symbols representing the buffer's state; which can be one or more "Displays symbols representing the buffer's state; which can be one or more
of: non-existent, modified or read-only." of: non-existent, modified or read-only."
(let ((state (list))) (let ((state (list))
(base-face (if active 'doom-default 'mode-line-inactive)))
(when buffer-file-name (when buffer-file-name
(if (file-exists-p buffer-file-name) (if (file-exists-p buffer-file-name)
(when (buffer-modified-p) (when (buffer-modified-p)
(push (all-the-icons-octicon "primitive-dot" :face 'font-lock-keyword-face :height 1.1 :v-adjust -0.05) state)) (push (all-the-icons-octicon "primitive-dot" :face `(minibuffer-prompt ,base-face) :height 1.1 :v-adjust -0.05) state))
(push (all-the-icons-octicon "circle-slash" :face 'doom-modeline-urgent :height 1.1 :v-adjust -0.05) state))) (push (all-the-icons-octicon "circle-slash" :face `(doom-modeline-urgent ,base-face) :height 1.1 :v-adjust -0.05) state)))
(if buffer-read-only (push (all-the-icons-octicon "lock" :face 'doom-modeline-urgent :height 1.1 :v-adjust -0.05) state)) (when buffer-read-only
(push (all-the-icons-octicon "lock" :face `(doom-modeline-urgent ,base-face) :height 1.1 :v-adjust -0.05) state))
(when state (when state
(concat (s-join " " state) " ")))) (concat (s-join (propertize " " 'face base-face) state)))))
(defun *buffer-info ()
"Combined information about the current buffer, including the current working
directory, the file name, and its state (modified, read-only or non-existent)."
(let ((face (if active 'doom-default 'mode-line-inactive)))
(concat (propertize " " 'face face)
(propertize (or (*buffer-path) "") 'face `(:inherit (,face doom-modeline-alternate)))
(propertize (or (*buffer-name) "") 'face face)
(propertize " " 'face face)
(aif (*buffer-state) (concat it (propertize " " 'face face)))
)))
(defun *buffer-encoding-abbrev () (defun *buffer-encoding-abbrev ()
"The line ending convention used in the buffer." "The line ending convention used in the buffer (if it isn't unix) and its
(if (memq buffer-file-coding-system '(utf-8 utf-8-unix)) character encoding (if it isn't UTF-8)."
"" (let ((sys (symbol-name buffer-file-coding-system)))
(symbol-name buffer-file-coding-system))) (concat (cond ((string-suffix-p "-mac" sys)
"MAC ")
((string-suffix-p "-dos" sys)
"DOS ")
(t ""))
(if (string-match-p "u\\(tf-8\\|ndecided\\)" sys)
""
(concat (s-chop-suffixes '("-unix" "-dos" "-mac") sys) " ")))))
(defun *major-mode () (defun *major-mode ()
"The major mode, including process, environment and text-scale info." "The major mode, including process, environment and text-scale info."
(concat " " (propertize
(format-mode-line mode-name) (concat " "
(if (stringp mode-line-process) mode-line-process) (format-mode-line mode-name)
(if doom-ml--env-version (concat " " doom-ml--env-version)) (if (stringp mode-line-process) mode-line-process)
(and (featurep 'face-remap) (if doom-ml--env-version (concat " " doom-ml--env-version))
(/= text-scale-mode-amount 0) (and (featurep 'face-remap)
(format " (%+d)" text-scale-mode-amount)) (/= text-scale-mode-amount 0)
" ")) (format " (%+d)" text-scale-mode-amount))
" ")
'face (if active 'mode-line 'mode-line-inactive)))
(defun *vc () (defun *vc ()
"Displays the current branch, colored based on its state." "Displays the current branch, colored based on its state."
@ -225,10 +239,7 @@ of: non-existent, modified or read-only."
:height 1.25) :height 1.25)
'display '(raise -0.1)) 'display '(raise -0.1))
" " " "
(propertize backend 'face (if active face)) (propertize backend 'face (if active face 'mode-line-inactive))
;; (if active
;; (propertize backend 'face `(:inherit (variable-pitch ,face)))
;; backend)
" ")))) " "))))
(defvar-local doom--flycheck-err-cache nil "") (defvar-local doom--flycheck-err-cache nil "")
@ -243,24 +254,21 @@ of: non-existent, modified or read-only."
doom--flycheck-cache) doom--flycheck-cache)
(and (setq doom--flycheck-err-cache flycheck-current-errors) (and (setq doom--flycheck-err-cache flycheck-current-errors)
(setq doom--flycheck-cache (setq doom--flycheck-cache
(let ((issues (doom-ml-flycheck-count 'error))) (let ((fw (doom-ml-flycheck-count 'warning))
(concat (if issues (fe (doom-ml-flycheck-count 'error)))
(concat (concat (if fe (concat
(doom-ml-icon "x" 'doom-modeline-urgent 1.2) (all-the-icons-octicon "x" :face 'doom-modeline-urgent :height 1.2 :v-adjust -0.06)
(propertize (format " %d issues" issues) (propertize (format " %d " fe) 'face 'doom-modeline-urgent)))
'face 'doom-modeline-urgent)) (if fw (concat
(setq issues (doom-ml-flycheck-count 'warning)) (all-the-icons-octicon "x" :face 'doom-modeline-warning :height 1.2 :v-adjust -0.06)
(if issues (propertize (format " %d " fw) 'face 'doom-modeline-warning)))
(concat (unless (or fe fw)
(doom-ml-icon "x" 'doom-modeline-warning 1.2) (when active
(propertize (format " %d issues" issues) (all-the-icons-octicon "check" :face 'doom-modeline-info :height 1.2 :v-adjust -0.06)))
'face 'doom-modeline-warning))
(when active
(doom-ml-icon "check" 'doom-modeline-info 1.2))))
" "))))) " ")))))
(when active (concat
(concat (all-the-icons-octicon "check" :face 'doom-modeline-info :height 1.2 :v-adjust -0.06)
(doom-ml-icon "check" 'doom-modeline-info 1.2) " "))))) " "))))
(defun *selection-info () (defun *selection-info ()
"Information about the current selection, such as how many characters and "Information about the current selection, such as how many characters and
@ -303,7 +311,7 @@ to be enabled."
(format " %s/%d%s " (format " %s/%d%s "
anzu--current-position anzu--total-matched anzu--current-position anzu--total-matched
(if anzu--overflow-p "+" "")) (if anzu--overflow-p "+" ""))
'face (if active 'doom-modeline-count)))) 'face (if active 'doom-modeline-count 'mode-line-inactive))))
(defun *evil-substitute () (defun *evil-substitute ()
"Show number of :s matches in real time." "Show number of :s matches in real time."
@ -318,7 +326,7 @@ to be enabled."
(count-matches pattern (car range) (cdr range)) (count-matches pattern (car range) (cdr range))
evil-ex-argument) evil-ex-argument)
" ... ")) " ... "))
'face (if active 'doom-modeline-count)))) 'face (if active 'doom-modeline-count 'mode-line-inactive))))
(defun *iedit () (defun *iedit ()
"Show the number of iedit regions matches + what match you're on." "Show the number of iedit regions matches + what match you're on."
@ -337,7 +345,7 @@ to be enabled."
(- length (-elem-index this-oc iedit-occurrences-overlays)) (- length (-elem-index this-oc iedit-occurrences-overlays))
"-")) "-"))
length)) length))
'face (if active 'doom-modeline-count)))) 'face (if active 'doom-modeline-count 'mode-line-inactive))))
(defun *buffer-position () (defun *buffer-position ()
"A more vim-like buffer position." "A more vim-like buffer position."
@ -353,28 +361,27 @@ to be enabled."
(cond ((= start 1) "Top") (cond ((= start 1) "Top")
((= end pend) "Bot") ((= end pend) "Bot")
(t (format "%d%%%%" (/ end 0.01 pend)))))) (t (format "%d%%%%" (/ end 0.01 pend))))))
'face (if active 'doom-modeline-alternate)))) 'face (if active 'doom-modeline-alternate 'mode-line-inactive))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun doom-mode-line (&optional id) (defun doom-mode-line (&optional id)
`(:eval `(:eval
(let* ((active (eq (selected-window) mode-line-selected-window)) (let* ((active (eq (selected-window) doom-ml-selected-window))
(lhs (list (propertize " " (lhs (list (propertize " "
'display 'display
(pl/percent-xpm doom-modeline-height 100 0 100 0 3 (pl/percent-xpm doom-modeline-height 100 0 100 0 3
(face-attribute (if active 'doom-modeline-bar 'doom-modeline-inactive-bar) :background nil t) (face-background (if active 'doom-modeline-bar 'mode-line-inactive))
nil)) nil))
(*macro-recording) (*macro-recording)
(*selection-info) (*selection-info)
(*anzu) (*anzu)
(*evil-substitute) (*evil-substitute)
(*iedit) (*iedit)
" "
,(if (eq id 'scratch) ,(if (eq id 'scratch)
'(*buffer-pwd) '(*buffer-project)
'(list (*buffer-path) (*buffer-name) " ")) '(*buffer-info))
(*buffer-state) " "
(*flycheck))) (*flycheck)))
(rhs (list (*buffer-encoding-abbrev) (rhs (list (*buffer-encoding-abbrev)
(*vc) (*vc)
@ -392,16 +399,17 @@ to be enabled."
;; Eldoc-in-mode-line support (for `eval-expression') ;; Eldoc-in-mode-line support (for `eval-expression')
;; ;;
(defvar doom-eldoc-modeline-bar
(pl/percent-xpm doom-modeline-height 100 0 100 0 3
(face-background 'doom-modeline-eldoc-bar)
nil))
(defun doom-eldoc-mode-line () (defun doom-eldoc-mode-line ()
`(:eval `(:eval
(let ((active (eq (selected-window) mode-line-selected-window))) (let ((active (eq (selected-window) doom-ml-selected-window)))
(list (list (propertize " " (list (list (propertize " " 'display doom-eldoc-modeline-bar)
'display (pl/percent-xpm doom-modeline-height 100 0 100 0 3
(face-attribute 'doom-modeline-eldoc-bar :background nil t)
nil))
(and (bound-and-true-p str) str)) (and (bound-and-true-p str) str))
(propertize (propertize " " 'display `((space :align-to (1- (+ right right-fringe right-margin)))))))))
" " 'display `((space :align-to (1- (+ right right-fringe right-margin)))))))))
(defun doom-eldoc-show-in-mode-line (input) (defun doom-eldoc-show-in-mode-line (input)
"Display string STR in the mode-line next to minibuffer." "Display string STR in the mode-line next to minibuffer."