diff --git a/core/core-ui.el b/core/core-ui.el index 9220d362a..7a1933a3d 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -116,94 +116,6 @@ Also see `doom-exit-buffer-hook'.") (defun define-fringe-bitmap (&rest _))) -;; -;; Modeline library -;; - -(defvar doom--modeline-fn-alist ()) -(defvar doom--modeline-var-alist ()) - -(defmacro def-modeline-segment! (name &rest body) - "Defines a modeline segment and byte compiles it." - (declare (indent defun) (doc-string 2)) - (let ((sym (intern (format "doom-modeline-segment--%s" name))) - (docstring (if (stringp (car body)) - (pop body) - (format "%s modeline segment" name)))) - (cond ((and (symbolp (car body)) - (not (cdr body))) - (add-to-list 'doom--modeline-var-alist (cons name (car body))) - `(add-to-list 'doom--modeline-var-alist (cons ',name ',(car body)))) - (t - (add-to-list 'doom--modeline-fn-alist (cons name sym)) - `(progn - (fset ',sym (lambda () ,docstring ,@body)) - (add-to-list 'doom--modeline-fn-alist (cons ',name ',sym)) - ,(unless (bound-and-true-p byte-compile-current-file) - `(let (byte-compile-warnings) - (byte-compile #',sym)))))))) - -(defun doom--prepare-modeline-segments (segments) - (let (forms it) - (dolist (seg segments) - (cond ((stringp seg) - (push seg forms)) - ((symbolp seg) - (cond ((setq it (cdr (assq seg doom--modeline-fn-alist))) - (push (list :eval (list it)) forms)) - ((setq it (cdr (assq seg doom--modeline-var-alist))) - (push it forms)) - ((error "%s is not a defined segment" seg)))) - ((error "%s is not a valid segment" seg)))) - (nreverse forms))) - -(defun def-modeline! (name lhs &optional rhs) - "Defines a modeline format and byte-compiles it. 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 `def-modeline-segment!'. - -Example: - (def-modeline! 'minimal - '(bar matches \" \" buffer-info) - '(media-info major-mode)) - (doom-set-modeline 'minimal t)" - (let ((sym (intern (format "doom-modeline-format--%s" name))) - (lhs-forms (doom--prepare-modeline-segments lhs)) - (rhs-forms (doom--prepare-modeline-segments rhs))) - (defalias sym - (lambda () - (let ((rhs-str (format-mode-line rhs-forms))) - (list lhs-forms - (propertize - " " 'display - `((space :align-to (- (+ right right-fringe right-margin) - ,(+ 1 (string-width rhs-str)))))) - rhs-str))) - (concat "Modeline:\n" - (format " %s\n %s" - (prin1-to-string lhs) - (prin1-to-string rhs)))) - (unless (bound-and-true-p byte-compile-current-file) - (let (byte-compile-warnings) - (byte-compile sym))))) - -(defun doom-modeline (key) - "Returns a mode-line configuration associated with KEY (a symbol). Throws an -error if it doesn't exist." - (let ((fn (intern-soft (format "doom-modeline-format--%s" key)))) - (when (functionp fn) - `(:eval (,fn))))) - -(defun doom-set-modeline (key &optional default) - "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." - (when-let* ((modeline (doom-modeline key))) - (setf (if default - (default-value 'mode-line-format) - (buffer-local-value 'mode-line-format (current-buffer))) - (list "%e" modeline)))) - - ;; ;; Plugins ;; diff --git a/init.example.el b/init.example.el index 30d307f36..6fb8bfeba 100644 --- a/init.example.el +++ b/init.example.el @@ -32,6 +32,7 @@ evil-goggles ; display visual hints when editing in evil ;fci ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE tags + ;modeline ; snazzy, Atom-inspired modeline, plus API nav-flash ; blink the current line after jumping ;neotree ; a project drawer, like NERDTree for vim treemacs ; a project drawer, like neotree but cooler diff --git a/modules/ui/doom-modeline/+new.el b/modules/ui/doom-modeline/+new.el deleted file mode 100644 index d54824b38..000000000 --- a/modules/ui/doom-modeline/+new.el +++ /dev/null @@ -1,507 +0,0 @@ -;;; ui/doom-modeline/config.el -*- lexical-binding: t; -*- -;;;###if (featurep! +new) - -;; This mode-line is experimental, may have bugs and is likely to change. It -;; also doesn't have all the features of the old modeline (yet). -;; -;; However, it is at least twice as fast as the original modeline, and a little -;; more flexible, what with `mode-line-format-left' and -;; `mode-line-format-right'. It also exposes a more powerful API for defining -;; modelines and modeline segments that make use of variable watchers and hooks -;; to update them. - -;;;; Benchmarks -;; (benchmark-run 1000 (format-mode-line mode-line-format)) -;; Old system: ~0.198 -;; New system: ~0.056 - -(defvar +doom-modeline-height 25 - "How tall the mode-line should be (only respected in GUI emacs).") - -(defvar +doom-modeline-buffer-name-function - #'doom-modeline--file-path - "TODO") - -(defvar anzu--state nil) -(defvar evil-mode nil) -(defvar evil-state nil) -(defvar evil-visual-selection nil) -(defvar iedit-mode nil) -(defvar all-the-icons-scale-factor) -(defvar all-the-icons-default-adjust) - -(defvar-local mode-line-format-left ()) -(defvar-local mode-line-format-right ()) -(put 'mode-line-format-left 'risky-local-variable t) -(put 'mode-line-format-right 'risky-local-variable t) - - -;; -;; Plugins -;; - -(def-package! anzu - :after-call isearch-mode - :config - (setq anzu-cons-mode-line-p nil - anzu-minimum-input-length 1 - anzu-search-threshold 250) - (global-anzu-mode +1) - - (defun +doom-modeline*fix-anzu-count (positions here) - (cl-loop for (start . end) in positions - collect t into before - when (and (>= here start) (<= here end)) - return (length before) - finally return 0)) - (advice-add #'anzu--where-is-here :override #'+doom-modeline*fix-anzu-count) - - ;; Avoid anzu conflicts across buffers - (mapc #'make-variable-buffer-local - '(anzu--total-matched anzu--current-position anzu--state - anzu--cached-count anzu--cached-positions anzu--last-command - anzu--last-isearch-string anzu--overflow-p)) - ;; Ensure anzu state is cleared when searches & iedit are done - (add-hook 'isearch-mode-end-hook #'anzu--reset-status t) - (add-hook 'doom-escape-hook #'anzu--reset-status t) - (add-hook 'iedit-mode-end-hook #'anzu--reset-status)) - - -(def-package! evil-anzu - :when (featurep! :feature evil) - :after-call (evil-ex-start-search evil-ex-start-word-search)) - - -;; -;; Helpers -;; - -;; Keep `+doom-modeline-current-window' up-to-date -(defvar +doom-modeline-current-window (frame-selected-window)) -(defun +doom-modeline|set-selected-window (&rest _) - "Sets `+doom-modeline-current-window' appropriately" - (when-let* ((win (frame-selected-window))) - (unless (minibuffer-window-active-p win) - (setq +doom-modeline-current-window win) - (force-mode-line-update)))) - -(defun +doom-modeline|unset-selected-window () - (setq +doom-modeline-current-window nil) - (force-mode-line-update)) - -(add-hook 'window-configuration-change-hook #'+doom-modeline|set-selected-window) -(add-hook 'doom-enter-window-hook #'+doom-modeline|set-selected-window) -(if (not (boundp 'after-focus-change-function)) - (progn - (add-hook 'focus-in-hook #'+doom-modeline|set-selected-window) - (add-hook 'focus-out-hook #'+doom-modeline|unset-selected-window)) - (defun +doom-modeline|refresh-frame () - (setq +doom-modeline-current-window nil) - (cl-loop for frame in (frame-list) - if (eq (frame-focus-state frame) t) - return (setq +doom-modeline-current-window (frame-selected-window frame))) - (force-mode-line-update t)) - (add-function :after after-focus-change-function #'+doom-modeline|refresh-frame)) - -(defsubst active () - (eq (selected-window) +doom-modeline-current-window)) - -;; xpm generator -(defun doom-modeline--make-xpm (width height &optional color) - "Create an XPM bitmap. Inspired by `powerline''s `pl/make-xpm'." - (propertize - " " 'display - (let ((data (make-list height (make-list width 1))) - (color (or color "None"))) - (ignore-errors - (create-image - (concat - (format "/* XPM */\nstatic char * percent[] = {\n\"%i %i 2 1\",\n\". c %s\",\n\" c %s\"," - (length (car data)) - (length data) - color - color) - (apply #'concat - (cl-loop with idx = 0 - with len = (length data) - for dl in data - do (cl-incf idx) - collect - (concat "\"" - (cl-loop for d in dl - if (= d 0) collect (string-to-char " ") - else collect (string-to-char ".")) - (if (eq idx len) "\"};" "\",\n"))))) - 'xpm t :ascent 'center))))) - -(defun doom-modeline--file-path (&optional path) - (let ((buffer-file-name (or path buffer-file-name)) - (root (doom-project-root)) - (active (active))) - (cond ((null root) - (propertize "%b" 'face (if active 'doom-modeline-buffer-file))) - ((or (null buffer-file-name) - (directory-name-p buffer-file-name)) - (propertize (abbreviate-file-name (or buffer-file-name default-directory)) - 'face (if active 'doom-modeline-buffer-path))) - ((let* ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified)) - (true-filename (file-truename buffer-file-name)) - (relative-dirs (file-relative-name (file-name-directory true-filename) - (concat root "../"))) - (relative-faces (or modified-faces (if active 'doom-modeline-buffer-path))) - (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) - (if (equal "./" relative-dirs) (setq relative-dirs "")) - (concat (propertize relative-dirs 'face (if relative-faces `(:inherit ,relative-faces))) - (propertize (file-name-nondirectory true-filename) - 'face (if file-faces `(:inherit ,file-faces))))))))) - - -;; -;; Macros -;; - -(cl-defmacro def-modeline-segment! (name &rest rest &key init faces hooks vars &allow-other-keys) - "TODO" - (let ((body rest)) - (while (keywordp (car body)) - (setq body (cddr body))) - (setq rest body)) - (unless EMACS26+ - (setq vars nil)) - (let ((docstring (if (stringp (car rest)) (pop rest))) - (realvar (if (and rest faces) (intern (format "doom-modeline--var-%s" name)) name))) - (macroexp-progn - (append (when rest - (if (or hooks vars) - (let ((setterfn (intern (format "doom-modeline--set-%s" name))) - (varsetterfn (intern (format "doom-modeline--setvar-%s" name)))) - (append `((fset ',setterfn - (lambda (&rest _) - (when (or (memq ',name mode-line-format-left) - (memq ',name mode-line-format-right)) - (setq-local ,realvar (progn ,@rest)))))) - (mapcar (lambda (hook) `(add-hook ',hook #',setterfn)) - hooks) - (when vars - `((fset ',varsetterfn - (lambda (sym val op where) - (and (eq op 'set) where - (with-current-buffer where - (set sym val) - (,setterfn))))) - ,@(mapcar (lambda (var) `(add-variable-watcher ',var #',varsetterfn)) - vars))))) - (setq init `(quote (:eval ,@rest))) - nil)) - (if (eq realvar name) - `((defvar-local ,name ,init ,docstring)) - `((defvar-local ,realvar nil) - (defvar-local ,name - '(:eval (cond ((active) ,realvar) (,realvar (substring-no-properties ,realvar)))) - ,docstring))) - `((put ',name 'risky-local-variable t)))))) - -;; -(defvar doom-mode-line-alist nil) - -(defun def-modeline-format! (name left &optional right) - (setf (alist-get name doom-mode-line-alist) (list left right))) - -(defun set-modeline! (name &optional default) - (let ((modeline (cdr (assq name doom-mode-line-alist)))) - (when modeline - (if default - (setq-default mode-line-format-left `("" ,@(car modeline)) - mode-line-format-right `("" ,@(cadr modeline))) - (setq mode-line-format-left `("" ,@(car modeline)) - mode-line-format-right `("" ,@(cadr modeline)))) - (force-mode-line-update)))) - - -;; -;; Bars -;; - -(defvar mode-line-bar-active nil "TODO") -(defvar mode-line-bar-inactive nil "TODO") -(defun doom-modeline|setup-bars () - (setq mode-line-bar-active - (doom-modeline--make-xpm 3 +doom-modeline-height (face-background 'doom-modeline-bar)) - mode-line-bar-inactive - (doom-modeline--make-xpm 3 +doom-modeline-height))) -(add-hook 'doom-load-modeline-hook #'doom-modeline|setup-bars) - -(defun doom-modeline|setup-bars-after-change (_sym val op _where) - (when (eq op 'set) - (let ((+doom-modeline-height val)) - (doom-modeline|setup-bars)))) -(add-variable-watcher '+doom-modeline-height #'doom-modeline|setup-bars-after-change) - -(def-modeline-segment! +mode-line-bar - (if (active) mode-line-bar-active mode-line-bar-inactive)) - - -;; -;; Segments -;; - -(defun +doom-modeline|update-on-change () - (doom-modeline--set-+mode-line-buffer-id) - (remove-hook 'post-command-hook #'+doom-modeline|update-on-change t)) -(defun +doom-modeline|start-update-on-change () - (add-hook 'post-command-hook #'+doom-modeline|update-on-change nil t)) -(add-hook 'first-change-hook #'+doom-modeline|start-update-on-change) - -(advice-add #'undo :after #'doom-modeline--set-+mode-line-buffer-id) -(advice-add #'undo-tree-undo :after #'doom-modeline--set-+mode-line-buffer-id) - -(def-modeline-segment! +mode-line-buffer-id - :hooks (find-file-hook after-change-functions read-only-mode-hook after-save-hook after-revert-hook) - :faces t - (concat (cond (buffer-read-only - (concat (all-the-icons-octicon - "lock" - :face 'doom-modeline-warning - :v-adjust -0.05) - " ")) - ((buffer-modified-p) - (concat (all-the-icons-faicon - "floppy-o" - :face 'doom-modeline-buffer-modified - :v-adjust -0.0575) - " ")) - ((and buffer-file-name (not (file-exists-p buffer-file-name))) - (concat (all-the-icons-octicon - "circle-slash" - :face 'doom-modeline-urgent - :v-adjust -0.05) - " "))) - (if buffer-file-name - (funcall +doom-modeline-buffer-name-function buffer-file-name) - "%b"))) - -(def-modeline-segment! +mode-line-buffer-directory - (let ((face (if (active) 'doom-modeline-buffer-path))) - (concat (if (display-graphic-p) " ") - (all-the-icons-octicon - "file-directory" - :face face - :v-adjust -0.05 - :height 1.25) - (propertize (concat " " (abbreviate-file-name default-directory)) - 'face face)))) - -(def-modeline-segment! +mode-line-vcs - :vars (vc-mode) - (when (and vc-mode buffer-file-name) - (let* ((backend (vc-backend buffer-file-name)) - (state (vc-state buffer-file-name backend))) - (let ((face 'mode-line-inactive) - (active (active)) - (all-the-icons-default-adjust -0.1)) - (concat " " - (cond ((memq state '(edited added)) - (if active (setq face 'doom-modeline-info)) - (all-the-icons-octicon - "git-compare" - :face face - :v-adjust -0.05)) - ((eq state 'needs-merge) - (if active (setq face 'doom-modeline-info)) - (all-the-icons-octicon "git-merge" :face face)) - ((eq state 'needs-update) - (if active (setq face 'doom-modeline-warning)) - (all-the-icons-octicon "arrow-down" :face face)) - ((memq state '(removed conflict unregistered)) - (if active (setq face 'doom-modeline-urgent)) - (all-the-icons-octicon "alert" :face face)) - (t - (if active (setq face 'font-lock-doc-face)) - (all-the-icons-octicon - "git-compare" - :face face - :v-adjust -0.05))) - " " - (propertize (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)) - 'face (if active face)) - " "))))) - -(def-modeline-segment! +mode-line-encoding - :hooks (after-save-hook find-file-hook) - :vars (buffer-file-coding-system) - (concat (pcase (coding-system-eol-type buffer-file-coding-system) - (0 "LF ") - (1 "CRLF ") - (2 "CR ")) - (let ((sys (coding-system-plist buffer-file-coding-system))) - (if (memq (plist-get sys :category) '(coding-category-undecided coding-category-utf-8)) - "UTF-8" - (upcase (symbol-name (plist-get sys :name))))) - " ")) - -(def-modeline-segment! +mode-line-major-mode - :vars (mode-name) - :faces t - (propertize (format-mode-line mode-name) 'face 'font-lock-keyword-face)) - - -(defun +doom-modeline--macro-recording () - "Display current Emacs or evil macro being recorded." - (when (and (active) (or defining-kbd-macro executing-kbd-macro)) - (let ((sep (propertize " " 'face 'doom-modeline-panel))) - (concat sep - (propertize (if (bound-and-true-p evil-this-macro) - (char-to-string evil-this-macro) - "Macro") - 'face 'doom-modeline-panel) - sep - (all-the-icons-octicon "triangle-right" - :face 'doom-modeline-panel - :v-adjust -0.05) - sep)))) - -(defsubst +doom-modeline--anzu () - "Show the match index and total number thereof. Requires `anzu', also -`evil-anzu' if using `evil-mode' for compatibility with `evil-search'." - (when (and anzu--state (not iedit-mode)) - (propertize - (let ((here anzu--current-position) - (total anzu--total-matched)) - (cond ((eq anzu--state 'replace-query) - (format " %d replace " total)) - ((eq anzu--state 'replace) - (format " %d/%d " here total)) - (anzu--overflow-p - (format " %s+ " total)) - (t - (format " %s/%d " here total)))) - 'face (if (active) 'doom-modeline-panel)))) - -(defsubst +doom-modeline--evil-substitute () - "Show number of matches for evil-ex substitutions and highlights in real time." - (when (and evil-mode - (or (assq 'evil-ex-substitute evil-ex-active-highlights-alist) - (assq 'evil-ex-global-match evil-ex-active-highlights-alist) - (assq 'evil-ex-buffer-match evil-ex-active-highlights-alist))) - (propertize - (let ((range (if evil-ex-range - (cons (car evil-ex-range) (cadr evil-ex-range)) - (cons (line-beginning-position) (line-end-position)))) - (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2)))) - (if pattern - (format " %s matches " (how-many pattern (car range) (cdr range))) - " - ")) - 'face (if (active) 'doom-modeline-panel)))) - -(defun doom-themes--overlay-sort (a b) - (< (overlay-start a) (overlay-start b))) - -(defsubst +doom-modeline--iedit () - "Show the number of iedit regions matches + what match you're on." - (when (and iedit-mode iedit-occurrences-overlays) - (propertize - (let ((this-oc (or (let ((inhibit-message t)) - (iedit-find-current-occurrence-overlay)) - (progn (iedit-prev-occurrence) - (iedit-find-current-occurrence-overlay)))) - (length (length iedit-occurrences-overlays))) - (format " %s/%d " - (if this-oc - (- length - (length (memq this-oc (sort (append iedit-occurrences-overlays nil) - #'doom-themes--overlay-sort))) - -1) - "-") - length)) - 'face (if (active) 'doom-modeline-panel)))) - -(def-modeline-segment! +mode-line-matches - "Displays: 1. the currently recording macro, 2. A current/total for the -current search term (with anzu), 3. The number of substitutions being conducted -with `evil-ex-substitute', and/or 4. The number of active `iedit' regions." - (let ((meta (concat (+doom-modeline--macro-recording) - (+doom-modeline--anzu) - (+doom-modeline--evil-substitute) - (+doom-modeline--iedit) - " "))) - (or (and (not (equal meta " ")) meta) - (if buffer-file-name " %I ")))) - -;; -(defsubst doom-column (pos) - (save-excursion (goto-char pos) - (current-column))) - -(defvar-local +doom-modeline-enable-word-count nil - "If non-nil, a word count will be added to the selection-info modeline -segment.") - -(defun +doom-modeline|enable-word-count () (setq +doom-modeline-enable-word-count t)) -(add-hook 'text-mode-hook #'+doom-modeline|enable-word-count) - -(def-modeline-segment! +mode-line-selection-info - (when mark-active - (cl-destructuring-bind (beg . end) - (if (eq evil-state 'visual) - (cons evil-visual-beginning evil-visual-end) - (cons (region-beginning) (region-end))) - (propertize - (let ((lines (count-lines beg (min end (point-max))))) - (concat (cond ((or (bound-and-true-p rectangle-mark-mode) - (eq 'block evil-visual-selection)) - (let ((cols (abs (- (doom-column end) - (doom-column beg))))) - (format "%dx%dB" lines cols))) - ((eq evil-visual-selection 'line) - (format "%dL" lines)) - ((> lines 1) - (format "%dC %dL" (- end beg) lines)) - ((format "%dC" (- end beg)))) - (when +doom-modeline-enable-word-count - (format " %dW" (count-words beg end))))) - 'face 'doom-modeline-highlight)))) - -(def-modeline-format! :main - '(+mode-line-bar +mode-line-matches " " +mode-line-buffer-id " %2l:%c %p " +mode-line-selection-info) - '(+mode-line-encoding +mode-line-major-mode +mode-line-vcs)) - -(def-modeline-format! :project - '(+mode-line-bar +mode-line-buffer-directory) - '(+mode-line-major-mode)) - - -;; -;; -;; - -(def-modeline-segment! mode-line-rest - (let ((rhs-str (format-mode-line mode-line-format-right))) - (list (propertize - " " 'display - `((space :align-to (- (+ right right-fringe right-margin) - ,(1+ (string-width rhs-str)))))) - rhs-str))) - -(setq-default mode-line-format '("" mode-line-format-left mode-line-rest)) - - -;; -(set-modeline! :main t) - -(add-hook! '+doom-dashboard-mode-hook (set-modeline! :project)) - - -;; -(defun doom-modeline-init () (run-hooks 'doom-load-modeline-hook)) -(add-hook 'doom-load-theme-hook #'doom-modeline-init) - -;; Ensure modeline is inactive when Emacs is unfocused (and active otherwise) -(defvar +doom-modeline-remap-face-cookie nil) -(defun +doom-modeline|focus () - (when +doom-modeline-remap-face-cookie - (require 'face-remap) - (face-remap-remove-relative +doom-modeline-remap-face-cookie))) -(defun +doom-modeline|unfocus () - (setq +doom-modeline-remap-face-cookie (face-remap-add-relative 'mode-line 'mode-line-inactive))) -(add-hook 'focus-in-hook #'+doom-modeline|focus) -(add-hook 'focus-out-hook #'+doom-modeline|unfocus) diff --git a/modules/ui/doom-modeline/+old.el b/modules/ui/doom-modeline/+old.el deleted file mode 100644 index bf73a0863..000000000 --- a/modules/ui/doom-modeline/+old.el +++ /dev/null @@ -1,674 +0,0 @@ -;;;###if (not (featurep! +new)) - -;; anzu and evil-anzu expose current/total state that can be displayed in the -;; mode-line. -(def-package! anzu - :after-call isearch-mode - :config - (setq anzu-cons-mode-line-p nil - anzu-minimum-input-length 1 - anzu-search-threshold 250) - (global-anzu-mode +1) - - (defun +doom-modeline*fix-anzu-count (positions here) - (cl-loop for (start . end) in positions - collect t into before - when (and (>= here start) (<= here end)) - return (length before) - finally return 0)) - (advice-add #'anzu--where-is-here :override #'+doom-modeline*fix-anzu-count) - - ;; Avoid anzu conflicts across buffers - (mapc #'make-variable-buffer-local - '(anzu--total-matched anzu--current-position anzu--state - anzu--cached-count anzu--cached-positions anzu--last-command - anzu--last-isearch-string anzu--overflow-p)) - ;; Ensure anzu state is cleared when searches & iedit are done - (add-hook 'isearch-mode-end-hook #'anzu--reset-status t) - (add-hook 'doom-escape-hook #'anzu--reset-status t) - (add-hook 'iedit-mode-end-hook #'anzu--reset-status)) - - -(def-package! evil-anzu - :when (featurep! :feature evil) - :after-call (evil-ex-start-search evil-ex-start-word-search)) - - -;; fish-style modeline -(def-package! shrink-path - :commands (shrink-path-prompt shrink-path-file-mixed)) - - -;; Keep `+doom-modeline-current-window' up-to-date -(defvar +doom-modeline-current-window (frame-selected-window)) -(defun +doom-modeline|set-selected-window (&rest _) - "Sets `+doom-modeline-current-window' appropriately" - (when-let* ((win (frame-selected-window))) - (unless (minibuffer-window-active-p win) - (setq +doom-modeline-current-window win) - (force-mode-line-update)))) - -(defun +doom-modeline|unset-selected-window () - (setq +doom-modeline-current-window nil) - (force-mode-line-update)) - -(add-hook 'window-configuration-change-hook #'+doom-modeline|set-selected-window) -(add-hook 'doom-enter-window-hook #'+doom-modeline|set-selected-window) -(with-no-warnings - (cond ((not (boundp 'after-focus-change-function)) - (add-hook 'focus-in-hook #'+doom-modeline|set-selected-window) - (add-hook 'focus-out-hook #'+doom-modeline|unset-selected-window)) - ((defun +doom-modeline|refresh-frame () - (setq +doom-modeline-current-window nil) - (cl-loop for frame in (frame-list) - if (eq (frame-focus-state frame) t) - return (setq +doom-modeline-current-window (frame-selected-window frame))) - (force-mode-line-update)) - (add-function :after after-focus-change-function #'+doom-modeline|refresh-frame)))) - - -;; -;; Variables -;; - -(defvar +doom-modeline-height 29 - "How tall the mode-line should be (only respected in GUI emacs).") - -(defvar +doom-modeline-bar-width 3 - "How wide the mode-line bar should be (only respected in GUI emacs).") - -(defvar +doom-modeline-buffer-file-name-style 'truncate-upto-project - "Determines the style used by `+doom-modeline-buffer-file-name'. - -Given ~/Projects/FOSS/emacs/lisp/comint.el -truncate-upto-project => ~/P/F/emacs/lisp/comint.el -truncate-upto-root => ~/P/F/e/lisp/comint.el -truncate-all => ~/P/F/e/l/comint.el -relative-from-project => emacs/lisp/comint.el -relative-to-project => lisp/comint.el -file-name => comint.el") - -;; externs -(defvar anzu--state nil) -(defvar evil-mode nil) -(defvar evil-state nil) -(defvar evil-visual-selection nil) -(defvar iedit-mode nil) -(defvar all-the-icons-scale-factor) -(defvar all-the-icons-default-adjust) - - -;; -;; Modeline helpers -;; - -(defsubst active () - (eq (selected-window) +doom-modeline-current-window)) - -(defun +doom-modeline--make-xpm (face width height) - "Create an XPM bitmap. Inspired by `powerline''s `pl/make-xpm'." - (propertize - " " 'display - (let ((data (make-list height (make-list width 1))) - (color (or (face-background face nil t) "None"))) - (ignore-errors - (create-image - (concat - (format "/* XPM */\nstatic char * percent[] = {\n\"%i %i 2 1\",\n\". c %s\",\n\" c %s\"," - (length (car data)) - (length data) - color - color) - (apply #'concat - (cl-loop with idx = 0 - with len = (length data) - for dl in data - do (cl-incf idx) - collect - (concat "\"" - (cl-loop for d in dl - if (= d 0) collect (string-to-char " ") - else collect (string-to-char ".")) - (if (eq idx len) "\"};" "\",\n"))))) - 'xpm t :ascent 'center))))) - -(defun +doom-modeline-buffer-file-name () - "Propertized `buffer-file-name' based on `+doom-modeline-buffer-file-name-style'." - (let ((buffer-file-name (or buffer-file-name "")) - (buffer-file-truename (or buffer-file-truename ""))) - (propertize - (pcase +doom-modeline-buffer-file-name-style - (`truncate-upto-project (+doom-modeline--buffer-file-name 'shrink)) - (`truncate-upto-root (+doom-modeline--buffer-file-name-truncate)) - (`truncate-all (+doom-modeline--buffer-file-name-truncate t)) - (`relative-to-project (+doom-modeline--buffer-file-name-relative)) - (`relative-from-project (+doom-modeline--buffer-file-name-relative 'include-project)) - (`file-name (propertize (file-name-nondirectory buffer-file-name) - 'face - (let ((face (or (and (buffer-modified-p) - 'doom-modeline-buffer-modified) - (and (active) - 'doom-modeline-buffer-file)))) - (when face `(:inherit ,face)))))) - 'help-echo buffer-file-truename))) - -(defun +doom-modeline--buffer-file-name-truncate (&optional truncate-tail) - "Propertized `buffer-file-name' that truncates every dir along path. -If TRUNCATE-TAIL is t also truncate the parent directory of the file." - (let ((dirs (shrink-path-prompt (file-name-directory buffer-file-truename))) - (active (active))) - (if (null dirs) - (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) - (let ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified))) - (let ((dirname (car dirs)) - (basename (cdr dirs)) - (dir-faces (or modified-faces (if active 'doom-modeline-project-root-dir))) - (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) - (concat (propertize (concat dirname - (if truncate-tail (substring basename 0 1) basename) - "/") - 'face (if dir-faces `(:inherit ,dir-faces))) - (propertize (file-name-nondirectory buffer-file-name) - 'face (if file-faces `(:inherit ,file-faces))))))))) - -(defun +doom-modeline--buffer-file-name-relative (&optional include-project) - "Propertized `buffer-file-name' showing directories relative to project's root only." - (let ((root (doom-project-root)) - (active (active))) - (if (null root) - (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) - (let* ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified)) - (true-filename (file-truename buffer-file-name)) - (relative-dirs (file-relative-name (file-name-directory true-filename) - (if include-project (concat root "../") root))) - (relative-faces (or modified-faces (if active 'doom-modeline-buffer-path))) - (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) - (if (equal "./" relative-dirs) (setq relative-dirs "")) - (concat (propertize relative-dirs 'face (if relative-faces `(:inherit ,relative-faces))) - (propertize (file-name-nondirectory true-filename) - 'face (if file-faces `(:inherit ,file-faces)))))))) - -(defun +doom-modeline--buffer-file-name (truncate-project-root-parent) - "Propertized `buffer-file-name'. -If TRUNCATE-PROJECT-ROOT-PARENT is t space will be saved by truncating it down -fish-shell style. - -Example: -~/Projects/FOSS/emacs/lisp/comint.el => ~/P/F/emacs/lisp/comint.el" - (let* ((project-root (doom-project-root)) - (file-name-split (shrink-path-file-mixed project-root - (file-name-directory buffer-file-name) - buffer-file-name)) - (active (active))) - (if (null file-name-split) - (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) - (pcase-let ((`(,root-path-parent ,project ,relative-path ,filename) file-name-split)) - (let ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified))) - (let ((sp-faces (or modified-faces (if active 'font-lock-comment-face))) - (project-faces (or modified-faces (if active 'font-lock-string-face))) - (relative-faces (or modified-faces (if active 'doom-modeline-buffer-path))) - (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) - (let ((sp-props `(,@(if sp-faces `(:inherit ,sp-faces)) ,@(if active '(:weight bold)))) - (project-props `(,@(if project-faces `(:inherit ,project-faces)) ,@(if active '(:weight bold)))) - (relative-props `(,@(if relative-faces `(:inherit ,relative-faces)))) - (file-props `(,@(if file-faces `(:inherit ,file-faces))))) - (concat (propertize (if truncate-project-root-parent - root-path-parent - (abbreviate-file-name project-root)) - 'face sp-props) - (propertize (concat project "/") 'face project-props) - (if relative-path (propertize relative-path 'face relative-props)) - (propertize filename 'face file-props))))))))) - - -;; -;; buffer information -;; - -(def-modeline-segment! buffer-default-directory - "Displays `default-directory'. This is for special buffers like the scratch -buffer where knowing the current project directory is important." - (let ((face (if (active) 'doom-modeline-buffer-path))) - (concat (if (display-graphic-p) " ") - (all-the-icons-octicon - "file-directory" - :face face - :v-adjust -0.05 - :height 1.25) - (propertize (concat " " (abbreviate-file-name default-directory)) - 'face face)))) - -(def-modeline-segment! 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)." - (concat (cond (buffer-read-only - (concat (all-the-icons-octicon - "lock" - :face 'doom-modeline-warning - :v-adjust -0.05) - " ")) - ((buffer-modified-p) - (concat (all-the-icons-faicon - "floppy-o" - :face 'doom-modeline-buffer-modified - :v-adjust -0.0575) - " ")) - ((and buffer-file-name - (not (file-exists-p buffer-file-name))) - (concat (all-the-icons-octicon - "circle-slash" - :face 'doom-modeline-urgent - :v-adjust -0.05) - " ")) - ((buffer-narrowed-p) - (concat (all-the-icons-octicon - "fold" - :face 'doom-modeline-warning - :v-adjust -0.05) - " "))) - (if buffer-file-name - (+doom-modeline-buffer-file-name) - "%b"))) - -(def-modeline-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) - ((active) 'doom-modeline-buffer-file)))) - -;; (defvar +doom-modeline--encoding nil) -;; (def-modeline-segment! buffer-encoding -;; "TODO" -;; +doom-modeline--encoding) - -;; (add-variable-watcher -;; 'buffer-file-coding-system -;; (lambda (_sym val op _where) -;; (when (eq op 'set) -;; (setq +doom-modeline--encoding -;; (concat (pcase (coding-system-eol-type val) -;; (0 "LF ") -;; (1 "CRLF ") -;; (2 "CR ")) -;; (let ((sys (coding-system-plist val))) -;; (if (memq (plist-get sys :category) '(coding-category-undecided coding-category-utf-8)) -;; "UTF-8" -;; (upcase (symbol-name (plist-get sys :name))))) -;; " "))))) - -(def-modeline-segment! buffer-encoding - "Displays the encoding and eol style of the buffer the same way Atom does." - (concat (pcase (coding-system-eol-type buffer-file-coding-system) - (0 "LF ") - (1 "CRLF ") - (2 "CR ")) - (let ((sys (coding-system-plist buffer-file-coding-system))) - (cond ((memq (plist-get sys :category) '(coding-category-undecided coding-category-utf-8)) - "UTF-8") - (t (upcase (symbol-name (plist-get sys :name)))))) - " ")) - - -;; -;; major-mode -;; - -(def-modeline-segment! major-mode - "The major mode, including process, environment and text-scale info." - (propertize - (concat (format-mode-line mode-name) - (when (stringp mode-line-process) - mode-line-process) - (and (boundp 'text-scale-mode-amount) - (/= text-scale-mode-amount 0) - (format " (%+d)" text-scale-mode-amount))) - 'face (if (active) 'doom-modeline-buffer-major-mode))) - - -;; -;; vcs -;; - -(defvar-local +doom-modeline--vcs nil) -(defun +doom-modeline--update-vcs () - (setq +doom-modeline--vcs - (when (and vc-mode buffer-file-name) - (let* ((backend (vc-backend buffer-file-name)) - (state (vc-state buffer-file-name backend))) - (let ((face 'mode-line-inactive) - (active (active)) - (all-the-icons-default-adjust -0.1)) - (concat " " - (cond ((memq state '(edited added)) - (if active (setq face 'doom-modeline-info)) - (all-the-icons-octicon - "git-compare" - :face face - :v-adjust -0.05)) - ((eq state 'needs-merge) - (if active (setq face 'doom-modeline-info)) - (all-the-icons-octicon "git-merge" :face face)) - ((eq state 'needs-update) - (if active (setq face 'doom-modeline-warning)) - (all-the-icons-octicon "arrow-down" :face face)) - ((memq state '(removed conflict unregistered)) - (if active (setq face 'doom-modeline-urgent)) - (all-the-icons-octicon "alert" :face face)) - (t - (if active (setq face 'font-lock-doc-face)) - (all-the-icons-octicon - "git-compare" - :face face - :v-adjust -0.05))) - " " - (propertize (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)) - 'face (if active face)) - " ")))))) -(add-hook 'after-save-hook #'+doom-modeline--update-vcs) -(add-hook 'find-file-hook #'+doom-modeline--update-vcs t) - -(def-modeline-segment! vcs - "Displays the current branch, colored based on its state." - +doom-modeline--vcs) - - -;; -;; flycheck -;; - -(defvar +doom-modeline-vspc - (propertize " " 'face 'variable-pitch) - "TODO") - -(defun +doom-ml-icon (icon &optional text face voffset) - "Displays an octicon ICON with FACE, followed by TEXT. Uses -`all-the-icons-octicon' to fetch the icon." - (concat (if vc-mode " " " ") - (when icon - (concat - (all-the-icons-material icon :face face :height 1.1 :v-adjust (or voffset -0.2)) - (if text +doom-modeline-vspc))) - (if text (propertize text 'face face)) - (if vc-mode " " " "))) - -(defvar-local +doom-modeline--flycheck nil) -(add-hook 'flycheck-status-changed-functions #'+doom-modeline|update-flycheck-segment) -(add-hook 'flycheck-mode-hook #'+doom-modeline|update-flycheck-segment) - -(defun +doom-modeline|update-flycheck-segment (&optional status) - (setq +doom-modeline--flycheck - (pcase status - ('finished (if flycheck-current-errors - (let-alist (flycheck-count-errors flycheck-current-errors) - (let ((sum (+ (or .error 0) (or .warning 0)))) - (+doom-ml-icon "do_not_disturb_alt" - (number-to-string sum) - (if .error 'doom-modeline-urgent 'doom-modeline-warning) - -0.25))) - (+doom-ml-icon "check" nil 'doom-modeline-info))) - ('running (+doom-ml-icon "access_time" nil 'font-lock-doc-face -0.25)) - ('no-checker (+doom-ml-icon "sim_card_alert" "-" 'font-lock-doc-face)) - ('errored (+doom-ml-icon "sim_card_alert" "Error" 'doom-modeline-urgent)) - ('interrupted (+doom-ml-icon "pause" "Interrupted" 'font-lock-doc-face))))) - -(def-modeline-segment! flycheck - "Displays color-coded flycheck error status in the current buffer with pretty -icons." - +doom-modeline--flycheck) - - -;; -;; selection-info -;; - -(defsubst doom-column (pos) - (save-excursion (goto-char pos) - (current-column))) - -(defvar-local +doom-modeline-enable-word-count nil - "If non-nil, a word count will be added to the selection-info modeline -segment.") - -(defun +doom-modeline|enable-word-count () (setq +doom-modeline-enable-word-count t)) -(add-hook 'text-mode-hook #'+doom-modeline|enable-word-count) - -(def-modeline-segment! selection-info - "Information about the current selection, such as how many characters and -lines are selected, or the NxM dimensions of a block selection." - (when (and mark-active (active)) - (cl-destructuring-bind (beg . end) - (if (eq evil-state 'visual) - (cons evil-visual-beginning evil-visual-end) - (cons (region-beginning) (region-end))) - (propertize - (let ((lines (count-lines beg (min end (point-max))))) - (concat (cond ((or (bound-and-true-p rectangle-mark-mode) - (eq 'block evil-visual-selection)) - (let ((cols (abs (- (doom-column end) - (doom-column beg))))) - (format "%dx%dB" lines cols))) - ((eq evil-visual-selection 'line) - (format "%dL" lines)) - ((> lines 1) - (format "%dC %dL" (- end beg) lines)) - ((format "%dC" (- end beg)))) - (when +doom-modeline-enable-word-count - (format " %dW" (count-words beg end))))) - 'face 'doom-modeline-highlight)))) - - -;; -;; matches (anzu, evil-substitute, iedit, macro) -;; - -(defun +doom-modeline--macro-recording () - "Display current Emacs or evil macro being recorded." - (when (and (active) (or defining-kbd-macro executing-kbd-macro)) - (let ((sep (propertize " " 'face 'doom-modeline-panel))) - (concat sep - (propertize (if (bound-and-true-p evil-this-macro) - (char-to-string evil-this-macro) - "Macro") - 'face 'doom-modeline-panel) - sep - (all-the-icons-octicon "triangle-right" - :face 'doom-modeline-panel - :v-adjust -0.05) - sep)))) - -(defsubst +doom-modeline--anzu () - "Show the match index and total number thereof. Requires `anzu', also -`evil-anzu' if using `evil-mode' for compatibility with `evil-search'." - (when (and anzu--state (not iedit-mode)) - (propertize - (let ((here anzu--current-position) - (total anzu--total-matched)) - (cond ((eq anzu--state 'replace-query) - (format " %d replace " total)) - ((eq anzu--state 'replace) - (format " %d/%d " here total)) - (anzu--overflow-p - (format " %s+ " total)) - (t - (format " %s/%d " here total)))) - 'face (if (active) 'doom-modeline-panel)))) - -(defsubst +doom-modeline--evil-substitute () - "Show number of matches for evil-ex substitutions and highlights in real time." - (when (and evil-mode - (or (assq 'evil-ex-substitute evil-ex-active-highlights-alist) - (assq 'evil-ex-global-match evil-ex-active-highlights-alist) - (assq 'evil-ex-buffer-match evil-ex-active-highlights-alist))) - (propertize - (let ((range (if evil-ex-range - (cons (car evil-ex-range) (cadr evil-ex-range)) - (cons (line-beginning-position) (line-end-position)))) - (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2)))) - (if pattern - (format " %s matches " (how-many pattern (car range) (cdr range))) - " - ")) - 'face (if (active) 'doom-modeline-panel)))) - -(defun doom-themes--overlay-sort (a b) - (< (overlay-start a) (overlay-start b))) - -(defsubst +doom-modeline--iedit () - "Show the number of iedit regions matches + what match you're on." - (when (and iedit-mode iedit-occurrences-overlays) - (propertize - (let ((this-oc (or (let ((inhibit-message t)) - (iedit-find-current-occurrence-overlay)) - (progn (iedit-prev-occurrence) - (iedit-find-current-occurrence-overlay)))) - (length (length iedit-occurrences-overlays))) - (format " %s/%d " - (if this-oc - (- length - (length (memq this-oc (sort (append iedit-occurrences-overlays nil) - #'doom-themes--overlay-sort))) - -1) - "-") - length)) - 'face (if (active) 'doom-modeline-panel)))) - -(def-modeline-segment! matches - "Displays: 1. the currently recording macro, 2. A current/total for the -current search term (with anzu), 3. The number of substitutions being conducted -with `evil-ex-substitute', and/or 4. The number of active `iedit' regions." - (let ((meta (concat (+doom-modeline--macro-recording) - (+doom-modeline--anzu) - (+doom-modeline--evil-substitute) - (+doom-modeline--iedit)))) - (or (and (not (equal meta "")) meta) - (if buffer-file-name " %I ")))) - - -;; -;; media-info -;; - -(def-modeline-segment! media-info - "Metadata regarding the current file, such as dimensions for images." - ;; TODO Include other information - (cond ((eq major-mode 'image-mode) - (cl-destructuring-bind (width . height) - (image-size (image-get-display-property) :pixels) - (format " %dx%d " width height))))) - - -;; -;; bar -;; - -(defvar +doom-modeline--bar-active nil) -(defvar +doom-modeline--bar-inactive nil) -(def-modeline-segment! bar - "The bar regulates the height of the mode-line in GUI Emacs. -Returns \"\" to not break --no-window-system." - (if window-system - (if (active) - +doom-modeline--bar-active - +doom-modeline--bar-inactive) - "")) - -(when EMACS26+ - (add-variable-watcher - '+doom-modeline-height - (lambda (_sym val op _where) - (when (and (eq op 'set) (integerp val)) - (+doom-modeline|refresh-bars +doom-modeline-bar-width val)))) - - (add-variable-watcher - '+doom-modeline-bar-width - (lambda (_sym val op _where) - (when (and (eq op 'set) (integerp val)) - (+doom-modeline|refresh-bars val +doom-modeline-height)))) - - (add-hook 'doom-big-font-mode-hook #'+doom-modeline|resize-for-big-font)) - - -;; -;; Mode lines -;; - -(def-modeline! main - (bar matches " " buffer-info " %l:%c %p " selection-info) - (buffer-encoding major-mode vcs flycheck)) - -(def-modeline! minimal - (bar matches " " buffer-info) - (media-info major-mode)) - -(def-modeline! special - (bar matches " " buffer-info-simple " %l:%c %p " selection-info) - (buffer-encoding major-mode flycheck)) - -(def-modeline! project - (bar buffer-default-directory) - (major-mode)) - -(def-modeline! media - (bar " %b ") - (media-info major-mode)) - - -;; -;; Hooks -;; - -(defun +doom-modeline|refresh-bars (&optional width height) - (setq +doom-modeline--bar-active - (+doom-modeline--make-xpm 'doom-modeline-bar - (or width +doom-modeline-bar-width) - (or height +doom-modeline-height)) - +doom-modeline--bar-inactive - (+doom-modeline--make-xpm 'doom-modeline-inactive-bar - (or width +doom-modeline-bar-width) - (or height +doom-modeline-height)))) - -(defun +doom-modeline|init () - ;; Create bars - (+doom-modeline|refresh-bars) - (unless after-init-time - ;; These buffers are already created and don't get modelines. For the love - ;; of Emacs, someone give the man a modeline! - (dolist (bname '("*scratch*" "*Messages*")) - (with-current-buffer bname - (doom-set-modeline 'main))))) - -(defun +doom-modeline|set-special-modeline () - (doom-set-modeline 'special)) - -(defun +doom-modeline|set-media-modeline () - (doom-set-modeline 'media)) - -(defun +doom-modeline|set-project-modeline () - (doom-set-modeline 'project)) - - -;; -;; Bootstrap -;; - -(doom-set-modeline 'main t) ; set default modeline - -(add-hook 'doom-load-theme-hook #'+doom-modeline|init) -(add-hook 'doom-scratch-buffer-hook #'+doom-modeline|set-special-modeline) -(add-hook '+doom-dashboard-mode-hook #'+doom-modeline|set-project-modeline) - -(add-hook 'image-mode-hook #'+doom-modeline|set-media-modeline) -(add-hook 'circe-mode-hook #'+doom-modeline|set-special-modeline) - -;; Ensure modeline is inactive when Emacs is unfocused (and active otherwise) -(defvar +doom-modeline-remap-face-cookie nil) -(defun +doom-modeline|focus () - (when +doom-modeline-remap-face-cookie - (require 'face-remap) - (face-remap-remove-relative +doom-modeline-remap-face-cookie))) -(defun +doom-modeline|unfocus () - (setq +doom-modeline-remap-face-cookie (face-remap-add-relative 'mode-line 'mode-line-inactive))) - -(add-hook 'focus-in-hook #'+doom-modeline|focus) -(add-hook 'focus-out-hook #'+doom-modeline|unfocus) diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el index 6d4053a97..b91676caf 100644 --- a/modules/ui/doom-modeline/config.el +++ b/modules/ui/doom-modeline/config.el @@ -1,5 +1,95 @@ ;;; ui/doom-modeline/config.el -*- lexical-binding: t; -*- + + +;; +;; Modeline library +;; + +(defvar doom--modeline-fn-alist ()) +(defvar doom--modeline-var-alist ()) + +(defmacro def-modeline-segment! (name &rest body) + "Defines a modeline segment and byte compiles it." + (declare (indent defun) (doc-string 2)) + (let ((sym (intern (format "doom-modeline-segment--%s" name))) + (docstring (if (stringp (car body)) + (pop body) + (format "%s modeline segment" name)))) + (cond ((and (symbolp (car body)) + (not (cdr body))) + (add-to-list 'doom--modeline-var-alist (cons name (car body))) + `(add-to-list 'doom--modeline-var-alist (cons ',name ',(car body)))) + (t + (add-to-list 'doom--modeline-fn-alist (cons name sym)) + `(progn + (fset ',sym (lambda () ,docstring ,@body)) + (add-to-list 'doom--modeline-fn-alist (cons ',name ',sym)) + ,(unless (bound-and-true-p byte-compile-current-file) + `(let (byte-compile-warnings) + (byte-compile #',sym)))))))) + +(defun doom--prepare-modeline-segments (segments) + (let (forms it) + (dolist (seg segments) + (cond ((stringp seg) + (push seg forms)) + ((symbolp seg) + (cond ((setq it (cdr (assq seg doom--modeline-fn-alist))) + (push (list :eval (list it)) forms)) + ((setq it (cdr (assq seg doom--modeline-var-alist))) + (push it forms)) + ((error "%s is not a defined segment" seg)))) + ((error "%s is not a valid segment" seg)))) + (nreverse forms))) + +(defun def-modeline! (name lhs &optional rhs) + "Defines a modeline format and byte-compiles it. 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 `def-modeline-segment!'. + +Example: + (def-modeline! 'minimal + '(bar matches \" \" buffer-info) + '(media-info major-mode)) + (doom-set-modeline 'minimal t)" + (let ((sym (intern (format "doom-modeline-format--%s" name))) + (lhs-forms (doom--prepare-modeline-segments lhs)) + (rhs-forms (doom--prepare-modeline-segments rhs))) + (defalias sym + (lambda () + (let ((rhs-str (format-mode-line rhs-forms))) + (list lhs-forms + (propertize + " " 'display + `((space :align-to (- (+ right right-fringe right-margin) + ,(+ 1 (string-width rhs-str)))))) + rhs-str))) + (concat "Modeline:\n" + (format " %s\n %s" + (prin1-to-string lhs) + (prin1-to-string rhs)))) + (unless (bound-and-true-p byte-compile-current-file) + (let (byte-compile-warnings) + (byte-compile sym))))) + +(defun doom-modeline (key) + "Returns a mode-line configuration associated with KEY (a symbol). Throws an +error if it doesn't exist." + (let ((fn (intern-soft (format "doom-modeline-format--%s" key)))) + (when (functionp fn) + `(:eval (,fn))))) + +(defun doom-set-modeline (key &optional default) + "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." + (when-let* ((modeline (doom-modeline key))) + (setf (if default + (default-value 'mode-line-format) + (buffer-local-value 'mode-line-format (current-buffer))) + (list "%e" modeline)))) + + ;; ;; Custom faces ;; @@ -70,7 +160,679 @@ active." ;; -(if (featurep! +new) - (load! "+new") - (load! "+old")) +;; Plugins +;; +;; anzu and evil-anzu expose current/total state that can be displayed in the +;; mode-line. +(def-package! anzu + :after-call isearch-mode + :config + (setq anzu-cons-mode-line-p nil + anzu-minimum-input-length 1 + anzu-search-threshold 250) + (global-anzu-mode +1) + + (defun +doom-modeline*fix-anzu-count (positions here) + (cl-loop for (start . end) in positions + collect t into before + when (and (>= here start) (<= here end)) + return (length before) + finally return 0)) + (advice-add #'anzu--where-is-here :override #'+doom-modeline*fix-anzu-count) + + ;; Avoid anzu conflicts across buffers + (mapc #'make-variable-buffer-local + '(anzu--total-matched anzu--current-position anzu--state + anzu--cached-count anzu--cached-positions anzu--last-command + anzu--last-isearch-string anzu--overflow-p)) + ;; Ensure anzu state is cleared when searches & iedit are done + (add-hook 'isearch-mode-end-hook #'anzu--reset-status t) + (add-hook 'doom-escape-hook #'anzu--reset-status t) + (add-hook 'iedit-mode-end-hook #'anzu--reset-status)) + + +(def-package! evil-anzu + :when (featurep! :feature evil) + :after-call (evil-ex-start-search evil-ex-start-word-search)) + + +;; fish-style modeline +(def-package! shrink-path + :commands (shrink-path-prompt shrink-path-file-mixed)) + + +;; Keep `+doom-modeline-current-window' up-to-date +(defvar +doom-modeline-current-window (frame-selected-window)) +(defun +doom-modeline|set-selected-window (&rest _) + "Sets `+doom-modeline-current-window' appropriately" + (when-let* ((win (frame-selected-window))) + (unless (minibuffer-window-active-p win) + (setq +doom-modeline-current-window win) + (force-mode-line-update)))) + +(defun +doom-modeline|unset-selected-window () + (setq +doom-modeline-current-window nil) + (force-mode-line-update)) + +(add-hook 'window-configuration-change-hook #'+doom-modeline|set-selected-window) +(add-hook 'doom-enter-window-hook #'+doom-modeline|set-selected-window) +(with-no-warnings + (cond ((not (boundp 'after-focus-change-function)) + (add-hook 'focus-in-hook #'+doom-modeline|set-selected-window) + (add-hook 'focus-out-hook #'+doom-modeline|unset-selected-window)) + ((defun +doom-modeline|refresh-frame () + (setq +doom-modeline-current-window nil) + (cl-loop for frame in (frame-list) + if (eq (frame-focus-state frame) t) + return (setq +doom-modeline-current-window (frame-selected-window frame))) + (force-mode-line-update)) + (add-function :after after-focus-change-function #'+doom-modeline|refresh-frame)))) + + +;; +;; Variables +;; + +(defvar +doom-modeline-height 23 + "How tall the mode-line should be (only respected in GUI emacs).") + +(defvar +doom-modeline-bar-width 3 + "How wide the mode-line bar should be (only respected in GUI emacs).") + +(defvar +doom-modeline-buffer-file-name-style 'truncate-upto-project + "Determines the style used by `+doom-modeline-buffer-file-name'. + +Given ~/Projects/FOSS/emacs/lisp/comint.el +truncate-upto-project => ~/P/F/emacs/lisp/comint.el +truncate-upto-root => ~/P/F/e/lisp/comint.el +truncate-all => ~/P/F/e/l/comint.el +relative-from-project => emacs/lisp/comint.el +relative-to-project => lisp/comint.el +file-name => comint.el") + +;; externs +(defvar anzu--state nil) +(defvar evil-mode nil) +(defvar evil-state nil) +(defvar evil-visual-selection nil) +(defvar iedit-mode nil) +(defvar all-the-icons-scale-factor) +(defvar all-the-icons-default-adjust) + + +;; +;; Modeline helpers +;; + +(defsubst active () + (eq (selected-window) +doom-modeline-current-window)) + +(defun +doom-modeline--make-xpm (face width height) + "Create an XPM bitmap. Inspired by `powerline''s `pl/make-xpm'." + (propertize + " " 'display + (let ((data (make-list height (make-list width 1))) + (color (or (face-background face nil t) "None"))) + (ignore-errors + (create-image + (concat + (format "/* XPM */\nstatic char * percent[] = {\n\"%i %i 2 1\",\n\". c %s\",\n\" c %s\"," + (length (car data)) + (length data) + color + color) + (apply #'concat + (cl-loop with idx = 0 + with len = (length data) + for dl in data + do (cl-incf idx) + collect + (concat "\"" + (cl-loop for d in dl + if (= d 0) collect (string-to-char " ") + else collect (string-to-char ".")) + (if (eq idx len) "\"};" "\",\n"))))) + 'xpm t :ascent 'center))))) + +(defun +doom-modeline-buffer-file-name () + "Propertized `buffer-file-name' based on `+doom-modeline-buffer-file-name-style'." + (let ((buffer-file-name (or buffer-file-name "")) + (buffer-file-truename (or buffer-file-truename ""))) + (propertize + (pcase +doom-modeline-buffer-file-name-style + (`truncate-upto-project (+doom-modeline--buffer-file-name 'shrink)) + (`truncate-upto-root (+doom-modeline--buffer-file-name-truncate)) + (`truncate-all (+doom-modeline--buffer-file-name-truncate t)) + (`relative-to-project (+doom-modeline--buffer-file-name-relative)) + (`relative-from-project (+doom-modeline--buffer-file-name-relative 'include-project)) + (`file-name (propertize (file-name-nondirectory buffer-file-name) + 'face + (let ((face (or (and (buffer-modified-p) + 'doom-modeline-buffer-modified) + (and (active) + 'doom-modeline-buffer-file)))) + (when face `(:inherit ,face)))))) + 'help-echo buffer-file-truename))) + +(defun +doom-modeline--buffer-file-name-truncate (&optional truncate-tail) + "Propertized `buffer-file-name' that truncates every dir along path. +If TRUNCATE-TAIL is t also truncate the parent directory of the file." + (let ((dirs (shrink-path-prompt (file-name-directory buffer-file-truename))) + (active (active))) + (if (null dirs) + (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) + (let ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified))) + (let ((dirname (car dirs)) + (basename (cdr dirs)) + (dir-faces (or modified-faces (if active 'doom-modeline-project-root-dir))) + (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) + (concat (propertize (concat dirname + (if truncate-tail (substring basename 0 1) basename) + "/") + 'face (if dir-faces `(:inherit ,dir-faces))) + (propertize (file-name-nondirectory buffer-file-name) + 'face (if file-faces `(:inherit ,file-faces))))))))) + +(defun +doom-modeline--buffer-file-name-relative (&optional include-project) + "Propertized `buffer-file-name' showing directories relative to project's root only." + (let ((root (doom-project-root)) + (active (active))) + (if (null root) + (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) + (let* ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified)) + (true-filename (file-truename buffer-file-name)) + (relative-dirs (file-relative-name (file-name-directory true-filename) + (if include-project (concat root "../") root))) + (relative-faces (or modified-faces (if active 'doom-modeline-buffer-path))) + (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) + (if (equal "./" relative-dirs) (setq relative-dirs "")) + (concat (propertize relative-dirs 'face (if relative-faces `(:inherit ,relative-faces))) + (propertize (file-name-nondirectory true-filename) + 'face (if file-faces `(:inherit ,file-faces)))))))) + +(defun +doom-modeline--buffer-file-name (truncate-project-root-parent) + "Propertized `buffer-file-name'. +If TRUNCATE-PROJECT-ROOT-PARENT is t space will be saved by truncating it down +fish-shell style. + +Example: +~/Projects/FOSS/emacs/lisp/comint.el => ~/P/F/emacs/lisp/comint.el" + (let* ((project-root (doom-project-root)) + (file-name-split (shrink-path-file-mixed project-root + (file-name-directory buffer-file-name) + buffer-file-name)) + (active (active))) + (if (null file-name-split) + (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) + (pcase-let ((`(,root-path-parent ,project ,relative-path ,filename) file-name-split)) + (let ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified))) + (let ((sp-faces (or modified-faces (if active 'font-lock-comment-face))) + (project-faces (or modified-faces (if active 'font-lock-string-face))) + (relative-faces (or modified-faces (if active 'doom-modeline-buffer-path))) + (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) + (let ((sp-props `(,@(if sp-faces `(:inherit ,sp-faces)) ,@(if active '(:weight bold)))) + (project-props `(,@(if project-faces `(:inherit ,project-faces)) ,@(if active '(:weight bold)))) + (relative-props `(,@(if relative-faces `(:inherit ,relative-faces)))) + (file-props `(,@(if file-faces `(:inherit ,file-faces))))) + (concat (propertize (if truncate-project-root-parent + root-path-parent + (abbreviate-file-name project-root)) + 'face sp-props) + (propertize (concat project "/") 'face project-props) + (if relative-path (propertize relative-path 'face relative-props)) + (propertize filename 'face file-props))))))))) + + +;; +;; buffer information +;; + +(def-modeline-segment! buffer-default-directory + "Displays `default-directory'. This is for special buffers like the scratch +buffer where knowing the current project directory is important." + (let ((face (if (active) 'doom-modeline-buffer-path))) + (concat (if (display-graphic-p) " ") + (all-the-icons-octicon + "file-directory" + :face face + :v-adjust -0.05 + :height 1.25) + (propertize (concat " " (abbreviate-file-name default-directory)) + 'face face)))) + +(def-modeline-segment! 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)." + (concat (cond (buffer-read-only + (concat (all-the-icons-octicon + "lock" + :face 'doom-modeline-warning + :v-adjust -0.05) + " ")) + ((buffer-modified-p) + (concat (all-the-icons-faicon + "floppy-o" + :face 'doom-modeline-buffer-modified + :v-adjust -0.0575) + " ")) + ((and buffer-file-name + (not (file-exists-p buffer-file-name))) + (concat (all-the-icons-octicon + "circle-slash" + :face 'doom-modeline-urgent + :v-adjust -0.05) + " ")) + ((buffer-narrowed-p) + (concat (all-the-icons-octicon + "fold" + :face 'doom-modeline-warning + :v-adjust -0.05) + " "))) + (if buffer-file-name + (+doom-modeline-buffer-file-name) + "%b"))) + +(def-modeline-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) + ((active) 'doom-modeline-buffer-file)))) + +;; (defvar +doom-modeline--encoding nil) +;; (def-modeline-segment! buffer-encoding +;; "TODO" +;; +doom-modeline--encoding) + +;; (add-variable-watcher +;; 'buffer-file-coding-system +;; (lambda (_sym val op _where) +;; (when (eq op 'set) +;; (setq +doom-modeline--encoding +;; (concat (pcase (coding-system-eol-type val) +;; (0 "LF ") +;; (1 "CRLF ") +;; (2 "CR ")) +;; (let ((sys (coding-system-plist val))) +;; (if (memq (plist-get sys :category) '(coding-category-undecided coding-category-utf-8)) +;; "UTF-8" +;; (upcase (symbol-name (plist-get sys :name))))) +;; " "))))) + +(def-modeline-segment! buffer-encoding + "Displays the encoding and eol style of the buffer the same way Atom does." + (concat (pcase (coding-system-eol-type buffer-file-coding-system) + (0 "LF ") + (1 "CRLF ") + (2 "CR ")) + (let ((sys (coding-system-plist buffer-file-coding-system))) + (cond ((memq (plist-get sys :category) '(coding-category-undecided coding-category-utf-8)) + "UTF-8") + (t (upcase (symbol-name (plist-get sys :name)))))) + " ")) + + +;; +;; major-mode +;; + +(def-modeline-segment! major-mode + "The major mode, including process, environment and text-scale info." + (propertize + (concat (format-mode-line mode-name) + (when (stringp mode-line-process) + mode-line-process) + (and (boundp 'text-scale-mode-amount) + (/= text-scale-mode-amount 0) + (format " (%+d)" text-scale-mode-amount))) + 'face (if (active) 'doom-modeline-buffer-major-mode))) + + +;; +;; vcs +;; + +(defvar-local +doom-modeline--vcs nil) +(defun +doom-modeline--update-vcs () + (setq +doom-modeline--vcs + (when (and vc-mode buffer-file-name) + (let* ((backend (vc-backend buffer-file-name)) + (state (vc-state buffer-file-name backend))) + (let ((face 'mode-line-inactive) + (active (active)) + (all-the-icons-default-adjust -0.1)) + (concat " " + (cond ((memq state '(edited added)) + (if active (setq face 'doom-modeline-info)) + (all-the-icons-octicon + "git-compare" + :face face + :v-adjust -0.05)) + ((eq state 'needs-merge) + (if active (setq face 'doom-modeline-info)) + (all-the-icons-octicon "git-merge" :face face)) + ((eq state 'needs-update) + (if active (setq face 'doom-modeline-warning)) + (all-the-icons-octicon "arrow-down" :face face)) + ((memq state '(removed conflict unregistered)) + (if active (setq face 'doom-modeline-urgent)) + (all-the-icons-octicon "alert" :face face)) + (t + (if active (setq face 'font-lock-doc-face)) + (all-the-icons-octicon + "git-compare" + :face face + :v-adjust -0.05))) + " " + (propertize (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)) + 'face (if active face)) + " ")))))) +(add-hook 'after-revert-hook #'+doom-modeline--update-vcs) +(add-hook 'after-save-hook #'+doom-modeline--update-vcs) +(add-hook 'find-file-hook #'+doom-modeline--update-vcs t) + +(def-modeline-segment! vcs + "Displays the current branch, colored based on its state." + +doom-modeline--vcs) + + +;; +;; flycheck +;; + +(defvar +doom-modeline-vspc + (propertize " " 'face 'variable-pitch) + "TODO") + +(defun +doom-ml-icon (icon &optional text face voffset) + "Displays an octicon ICON with FACE, followed by TEXT. Uses +`all-the-icons-octicon' to fetch the icon." + (concat (if vc-mode " " " ") + (when icon + (concat + (all-the-icons-material icon :face face :height 1.1 :v-adjust (or voffset -0.2)) + (if text +doom-modeline-vspc))) + (if text (propertize text 'face face)) + (if vc-mode " " " "))) + +(defvar-local +doom-modeline--flycheck nil) +(add-hook 'flycheck-status-changed-functions #'+doom-modeline|update-flycheck-segment) +(add-hook 'flycheck-mode-hook #'+doom-modeline|update-flycheck-segment) + +(defun +doom-modeline|update-flycheck-segment (&optional status) + (setq +doom-modeline--flycheck + (pcase status + ('finished (if flycheck-current-errors + (let-alist (flycheck-count-errors flycheck-current-errors) + (let ((sum (+ (or .error 0) (or .warning 0)))) + (+doom-ml-icon "do_not_disturb_alt" + (number-to-string sum) + (if .error 'doom-modeline-urgent 'doom-modeline-warning) + -0.25))) + (+doom-ml-icon "check" nil 'doom-modeline-info))) + ('running (+doom-ml-icon "access_time" nil 'font-lock-doc-face -0.25)) + ('no-checker (+doom-ml-icon "sim_card_alert" "-" 'font-lock-doc-face)) + ('errored (+doom-ml-icon "sim_card_alert" "Error" 'doom-modeline-urgent)) + ('interrupted (+doom-ml-icon "pause" "Interrupted" 'font-lock-doc-face))))) + +(def-modeline-segment! flycheck + "Displays color-coded flycheck error status in the current buffer with pretty +icons." + +doom-modeline--flycheck) + + +;; +;; selection-info +;; + +(defsubst doom-column (pos) + (save-excursion (goto-char pos) + (current-column))) + +(defvar-local +doom-modeline-enable-word-count nil + "If non-nil, a word count will be added to the selection-info modeline +segment.") + +(defun +doom-modeline|enable-word-count () (setq +doom-modeline-enable-word-count t)) +(add-hook 'text-mode-hook #'+doom-modeline|enable-word-count) + +(def-modeline-segment! selection-info + "Information about the current selection, such as how many characters and +lines are selected, or the NxM dimensions of a block selection." + (when (and mark-active (active)) + (cl-destructuring-bind (beg . end) + (if (eq evil-state 'visual) + (cons evil-visual-beginning evil-visual-end) + (cons (region-beginning) (region-end))) + (propertize + (let ((lines (count-lines beg (min end (point-max))))) + (concat (cond ((or (bound-and-true-p rectangle-mark-mode) + (eq 'block evil-visual-selection)) + (let ((cols (abs (- (doom-column end) + (doom-column beg))))) + (format "%dx%dB" lines cols))) + ((eq evil-visual-selection 'line) + (format "%dL" lines)) + ((> lines 1) + (format "%dC %dL" (- end beg) lines)) + ((format "%dC" (- end beg)))) + (when +doom-modeline-enable-word-count + (format " %dW" (count-words beg end))))) + 'face 'doom-modeline-highlight)))) + + +;; +;; matches (anzu, evil-substitute, iedit, macro) +;; + +(defun +doom-modeline--macro-recording () + "Display current Emacs or evil macro being recorded." + (when (and (active) (or defining-kbd-macro executing-kbd-macro)) + (let ((sep (propertize " " 'face 'doom-modeline-panel))) + (concat sep + (propertize (if (bound-and-true-p evil-this-macro) + (char-to-string evil-this-macro) + "Macro") + 'face 'doom-modeline-panel) + sep + (all-the-icons-octicon "triangle-right" + :face 'doom-modeline-panel + :v-adjust -0.05) + sep)))) + +(defsubst +doom-modeline--anzu () + "Show the match index and total number thereof. Requires `anzu', also +`evil-anzu' if using `evil-mode' for compatibility with `evil-search'." + (when (and anzu--state (not iedit-mode)) + (propertize + (let ((here anzu--current-position) + (total anzu--total-matched)) + (cond ((eq anzu--state 'replace-query) + (format " %d replace " total)) + ((eq anzu--state 'replace) + (format " %d/%d " here total)) + (anzu--overflow-p + (format " %s+ " total)) + (t + (format " %s/%d " here total)))) + 'face (if (active) 'doom-modeline-panel)))) + +(defsubst +doom-modeline--evil-substitute () + "Show number of matches for evil-ex substitutions and highlights in real time." + (when (and evil-mode + (or (assq 'evil-ex-substitute evil-ex-active-highlights-alist) + (assq 'evil-ex-global-match evil-ex-active-highlights-alist) + (assq 'evil-ex-buffer-match evil-ex-active-highlights-alist))) + (propertize + (let ((range (if evil-ex-range + (cons (car evil-ex-range) (cadr evil-ex-range)) + (cons (line-beginning-position) (line-end-position)))) + (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2)))) + (if pattern + (format " %s matches " (how-many pattern (car range) (cdr range))) + " - ")) + 'face (if (active) 'doom-modeline-panel)))) + +(defun doom-themes--overlay-sort (a b) + (< (overlay-start a) (overlay-start b))) + +(defsubst +doom-modeline--iedit () + "Show the number of iedit regions matches + what match you're on." + (when (and iedit-mode iedit-occurrences-overlays) + (propertize + (let ((this-oc (or (let ((inhibit-message t)) + (iedit-find-current-occurrence-overlay)) + (progn (iedit-prev-occurrence) + (iedit-find-current-occurrence-overlay)))) + (length (length iedit-occurrences-overlays))) + (format " %s/%d " + (if this-oc + (- length + (length (memq this-oc (sort (append iedit-occurrences-overlays nil) + #'doom-themes--overlay-sort))) + -1) + "-") + length)) + 'face (if (active) 'doom-modeline-panel)))) + +(def-modeline-segment! matches + "Displays: 1. the currently recording macro, 2. A current/total for the +current search term (with anzu), 3. The number of substitutions being conducted +with `evil-ex-substitute', and/or 4. The number of active `iedit' regions." + (let ((meta (concat (+doom-modeline--macro-recording) + (+doom-modeline--anzu) + (+doom-modeline--evil-substitute) + (+doom-modeline--iedit)))) + (or (and (not (equal meta "")) meta) + (if buffer-file-name " %I ")))) + + +;; +;; media-info +;; + +(def-modeline-segment! media-info + "Metadata regarding the current file, such as dimensions for images." + ;; TODO Include other information + (cond ((eq major-mode 'image-mode) + (cl-destructuring-bind (width . height) + (image-size (image-get-display-property) :pixels) + (format " %dx%d " width height))))) + + +;; +;; bar +;; + +(defvar +doom-modeline--bar-active nil) +(defvar +doom-modeline--bar-inactive nil) +(def-modeline-segment! bar + "The bar regulates the height of the mode-line in GUI Emacs. +Returns \"\" to not break --no-window-system." + (if window-system + (if (active) + +doom-modeline--bar-active + +doom-modeline--bar-inactive) + "")) + +(when EMACS26+ + (add-variable-watcher + '+doom-modeline-height + (lambda (_sym val op _where) + (when (and (eq op 'set) (integerp val)) + (+doom-modeline|refresh-bars +doom-modeline-bar-width val)))) + + (add-variable-watcher + '+doom-modeline-bar-width + (lambda (_sym val op _where) + (when (and (eq op 'set) (integerp val)) + (+doom-modeline|refresh-bars val +doom-modeline-height)))) + + (add-hook 'doom-big-font-mode-hook #'+doom-modeline|resize-for-big-font)) + + +;; +;; Mode lines +;; + +(def-modeline! 'main + '(bar matches " " buffer-info " %l:%c %p " selection-info) + '(buffer-encoding major-mode vcs flycheck)) + +(def-modeline! 'minimal + '(bar matches " " buffer-info) + '(media-info major-mode)) + +(def-modeline! 'special + '(bar matches " " buffer-info-simple " %l:%c %p " selection-info) + '(buffer-encoding major-mode flycheck)) + +(def-modeline! 'project + '(bar buffer-default-directory) + '(major-mode)) + +(def-modeline! 'media + '(bar " %b ") + '(media-info major-mode)) + + +;; +;; Hooks +;; + +(defun +doom-modeline|refresh-bars (&optional width height) + (setq +doom-modeline--bar-active + (+doom-modeline--make-xpm 'doom-modeline-bar + (or width +doom-modeline-bar-width) + (or height +doom-modeline-height)) + +doom-modeline--bar-inactive + (+doom-modeline--make-xpm 'doom-modeline-inactive-bar + (or width +doom-modeline-bar-width) + (or height +doom-modeline-height)))) + +(defun +doom-modeline|init () + ;; Create bars + (+doom-modeline|refresh-bars) + (unless after-init-time + ;; These buffers are already created and don't get modelines. For the love + ;; of Emacs, someone give the man a modeline! + (dolist (bname '("*scratch*" "*Messages*")) + (with-current-buffer bname + (doom-set-modeline 'main))))) + +(defun +doom-modeline|set-special-modeline () + (doom-set-modeline 'special)) + +(defun +doom-modeline|set-media-modeline () + (doom-set-modeline 'media)) + +(defun +doom-modeline|set-project-modeline () + (doom-set-modeline 'project)) + + +;; +;; Bootstrap +;; + +(doom-set-modeline 'main t) ; set default modeline + +(add-hook 'doom-load-theme-hook #'+doom-modeline|init) +(add-hook 'doom-scratch-buffer-hook #'+doom-modeline|set-special-modeline) +(add-hook '+doom-dashboard-mode-hook #'+doom-modeline|set-project-modeline) + +(add-hook 'image-mode-hook #'+doom-modeline|set-media-modeline) +(add-hook 'circe-mode-hook #'+doom-modeline|set-special-modeline) + +;; Ensure modeline is inactive when Emacs is unfocused (and active otherwise) +(defvar +doom-modeline-remap-face-cookie nil) +(defun +doom-modeline|focus () + (when +doom-modeline-remap-face-cookie + (require 'face-remap) + (face-remap-remove-relative +doom-modeline-remap-face-cookie))) +(defun +doom-modeline|unfocus () + (setq +doom-modeline-remap-face-cookie (face-remap-add-relative 'mode-line 'mode-line-inactive))) + +(add-hook 'focus-in-hook #'+doom-modeline|focus) +(add-hook 'focus-out-hook #'+doom-modeline|unfocus) diff --git a/modules/ui/modeline/README.org b/modules/ui/modeline/README.org new file mode 100644 index 000000000..e69de29bb diff --git a/modules/ui/modeline/autoload/modeline.el b/modules/ui/modeline/autoload/modeline.el new file mode 100644 index 000000000..ef9d21a59 --- /dev/null +++ b/modules/ui/modeline/autoload/modeline.el @@ -0,0 +1,19 @@ +;;; ui/modeline/autoload/modeline.el -*- lexical-binding: t; -*- + +;; (defvar +modeline--old-bar-height nil) +;; ;;;###autoload +;; (defun +modeline|resize-for-big-font () +;; "Adjust the modeline's height when `doom-big-font-mode' is enabled. This was +;; made to be added to `doom-big-font-mode-hook'." +;; (unless +modeline--old-bar-height +;; (setq +modeline--old-bar-height +doom-modeline-height)) +;; (let ((default-height +modeline--old-bar-height)) +;; (if doom-big-font-mode +;; (let* ((font-size (font-get doom-font :size)) +;; (big-size (font-get doom-big-font :size)) +;; (ratio (/ (float big-size) font-size))) +;; (setq +doom-modeline-height (ceiling (* default-height ratio 0.75)))) +;; (setq +doom-modeline-height default-height)) +;; ;; already has a variable watcher in Emacs 26+ +;; (unless EMACS26+ (+doom-modeline|refresh-bars)))) + diff --git a/modules/ui/modeline/autoload/settings.el b/modules/ui/modeline/autoload/settings.el new file mode 100644 index 000000000..2a27d6764 --- /dev/null +++ b/modules/ui/modeline/autoload/settings.el @@ -0,0 +1,92 @@ +;;; ui/modeline/autoload/settings.el -*- lexical-binding: t; -*- + +(defvar +modeline--alist nil) + +;;;###autodef +(defun def-modeline-format! (name left &optional right) + "Define a preset modeline format by name. + +NAME is a symbol. The convention is to use keywords for global formats, like +:main or :project, but to use regular symbols for buffer-local formats, like +'twitter and 'pdf. + +LEFT and RIGHT are lists that assume the same structure as `mode-line-format', +and make up the mode-line in two parts, separated by variable-width space, to +keep them left and right aligned respectively." + (setf (alist-get name +modeline--alist) (list left right))) + +;;;###autodef +(defmacro def-modeline-segment! (name &rest rest) + "TODO" + (declare (doc-string 2)) + (let ((docstring (if (and (stringp (car rest)) (cdr rest)) (pop rest))) + body) + (macroexp-progn + (if (not (keywordp (car rest))) + `((defvar-local ,name nil ,docstring) + (setq-default + ,name + ,(if (or (stringp (car rest)) + (memq (car (car-safe rest)) '(:eval :propertize))) + (car rest) + `(quote (:eval ,(macroexp-progn rest))))) + (put ',name 'risky-local-variable t)) + ;; isolate body + (setq body rest) + (while (keywordp (car body)) + (setq body (cddr body))) + ;; + (cl-destructuring-bind (&key init faces on-hooks on-set activate deactivate &allow-other-keys) + rest + (let ((realvar (if (and body faces) + (intern (format "+modeline--var-%s" name)) + name))) + (append (when body + (if (or on-hooks on-set) + (let ((setterfn (intern (format "+modeline--set-%s" name))) + (varsetterfn (intern (format "+modeline--setvar-%s" name)))) + (append `((fset ',setterfn + (lambda (&rest _) + (when (or (memq ',name +modeline-format-left) + (memq ',name +modeline-format-right)) + (setq-local ,realvar ,(macroexp-progn body))))) + (byte-compile ',setterfn)) + (mapcar (lambda (hook) `(add-hook ',hook #',setterfn)) + on-hooks) + (when on-set + `((fset ',varsetterfn + (lambda (sym val op where) + (and (eq op 'set) where + (with-current-buffer where + (set sym val) + (,setterfn))))) + ,@(mapcar (lambda (var) `(add-variable-watcher ',var #',varsetterfn)) + on-set))))) + (setq init `(quote (:eval ,(macroexp-progn body)))) + nil)) + (if (eq realvar name) + `((defvar-local ,name nil ,docstring) + (setq-default ,name ,init)) + `((defvar-local ,realvar nil) + (defvar-local ,name nil ,docstring) + (setq-default + ,name '(:eval (cond ((active) ,realvar) + (,realvar (substring-no-properties ,realvar))))))) + `((put ',name 'risky-local-variable t))))))))) + +;;;###autodef +(defun set-modeline! (name &optional default) + "Replace the current buffer's modeline with a preset mode-line format defined +with `def-modeline-format!'. + +If DEFAULT is non-nil, make it the default mode-line for all buffers." + (cl-check-type name symbol) + (let ((modeline (cdr (assq name +modeline--alist)))) + (unless modeline + (error "The %s modeline format does not exist" name)) + (if default + (setq-default +modeline-format-left `("" ,@(car modeline)) + +modeline-format-right `("" ,@(cadr modeline))) + (setq +modeline-format-left `("" ,@(car modeline)) + +modeline-format-right `("" ,@(cadr modeline)))) + (force-mode-line-update))) diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el new file mode 100644 index 000000000..ca5f82011 --- /dev/null +++ b/modules/ui/modeline/config.el @@ -0,0 +1,532 @@ +;;; ui/modeline/config.el -*- lexical-binding: t; -*- + +;; This mode-line is experimental, may have bugs and is likely to change. It +;; also doesn't have all the features of the old modeline (yet). +;; +;; However, it is at least twice as fast as the original modeline, and a little +;; more flexible, what with `+modeline-format-left' and +;; `+modeline-format-right'. It also exposes a more powerful API for defining +;; modelines and modeline segments that make use of variable watchers and hooks +;; to update them. + +;;;; Benchmarks +;; (benchmark-run 1000 (format-mode-line mode-line-format)) +;; Old system: ~0.198 +;; New system: ~0.056 + +(defvar +modeline-height 21 + "How tall the mode-line should be (only respected in GUI emacs).") + +(defvar +modeline-buffer-path-function #'+modeline-file-path + "The function that returns the buffer name display for file-visiting +buffers.") + +;; +(defvar-local +modeline-format-left () "TODO") +(defvar-local +modeline-format-right () "TODO") +(put '+modeline-format-left 'risky-local-variable t) +(put '+modeline-format-right 'risky-local-variable t) +;; Convenience aliases +(defvaralias 'mode-line-format-left '+modeline-format-left) +(defvaralias 'mode-line-format-right '+modeline-format-right) + +;; externs +(defvar anzu--state nil) +(defvar evil-mode nil) +(defvar evil-state nil) +(defvar evil-visual-selection nil) +(defvar iedit-mode nil) +(defvar all-the-icons-scale-factor) +(defvar all-the-icons-default-adjust) + + +;; +;; Custom faces +;; + +(defgroup +modeline nil + "TODO" + :group 'faces) + +(defface doom-modeline-buffer-path + '((t (:inherit (mode-line-emphasis bold)))) + "Face used for the dirname part of the buffer path." + :group '+modeline) + +(defface doom-modeline-buffer-file + '((t (:inherit (mode-line-buffer-id bold)))) + "Face used for the filename part of the mode-line buffer path." + :group '+modeline) + +(defface doom-modeline-buffer-modified '((t (:inherit (error bold) :background nil))) + "Face used for the 'unsaved' symbol in the mode-line." + :group '+modeline) + +(defface doom-modeline-buffer-major-mode '((t (:inherit (mode-line-emphasis bold)))) + "Face used for the major-mode segment in the mode-line." + :group '+modeline) + +(defface doom-modeline-highlight '((t (:inherit mode-line-emphasis))) + "Face for bright segments of the mode-line." + :group '+modeline) + +(defface doom-modeline-panel '((t (:inherit mode-line-highlight))) + "Face for 'X out of Y' segments, such as `+modeline--anzu', +`+modeline--evil-substitute' and `iedit'" + :group '+modeline) + +(defface doom-modeline-info `((t (:inherit (success bold)))) + "Face for info-level messages in the modeline. Used by `*vc'." + :group '+modeline) + +(defface doom-modeline-warning `((t (:inherit (warning bold)))) + "Face for warnings in the modeline. Used by `*flycheck'" + :group '+modeline) + +(defface doom-modeline-urgent `((t (:inherit (error bold)))) + "Face for errors in the modeline. Used by `*flycheck'" + :group '+modeline) + +(defface doom-modeline-bar '((t (:inherit highlight))) + "The face used for the left-most bar on the mode-line of an active window." + :group '+modeline) + + +;; +;; Plugins +;; + +(def-package! anzu + :after-call isearch-mode + :config + (setq anzu-cons-mode-line-p nil + anzu-minimum-input-length 1 + anzu-search-threshold 250) + (global-anzu-mode +1) + + (defun +modeline*fix-anzu-count (positions here) + (cl-loop for (start . end) in positions + collect t into before + when (and (>= here start) (<= here end)) + return (length before) + finally return 0)) + (advice-add #'anzu--where-is-here :override #'+modeline*fix-anzu-count) + + ;; Avoid anzu conflicts across buffers + (mapc #'make-variable-buffer-local + '(anzu--total-matched anzu--current-position anzu--state + anzu--cached-count anzu--cached-positions anzu--last-command + anzu--last-isearch-string anzu--overflow-p)) + ;; Ensure anzu state is cleared when searches & iedit are done + (add-hook 'isearch-mode-end-hook #'anzu--reset-status t) + (add-hook 'doom-escape-hook #'anzu--reset-status t) + (add-hook 'iedit-mode-end-hook #'anzu--reset-status)) + + +(def-package! evil-anzu + :when (featurep! :feature evil) + :after-call (evil-ex-start-search evil-ex-start-word-search)) + + +;; +;; Hacks +;; + +;; Keep `+modeline-current-window' up-to-date +(defvar +modeline-current-window (frame-selected-window)) + +(defun +modeline|set-selected-window (&rest _) + "Sets `+modeline-current-window' appropriately" + (when-let* ((win (frame-selected-window))) + (unless (minibuffer-window-active-p win) + (setq +modeline-current-window win) + (force-mode-line-update)))) + +(defun +modeline|unset-selected-window () + (setq +modeline-current-window nil) + (force-mode-line-update)) + +(add-hook 'window-configuration-change-hook #'+modeline|set-selected-window) +(add-hook 'doom-enter-window-hook #'+modeline|set-selected-window) +(if (not (boundp 'after-focus-change-function)) + (progn + (add-hook 'focus-in-hook #'+modeline|set-selected-window) + (add-hook 'focus-out-hook #'+modeline|unset-selected-window)) + (defun +modeline|refresh-frame () + (setq +modeline-current-window nil) + (cl-loop for frame in (frame-list) + if (eq (frame-focus-state frame) t) + return (setq +modeline-current-window (frame-selected-window frame))) + (force-mode-line-update t)) + (add-function :after after-focus-change-function #'+modeline|refresh-frame)) + +(defsubst active () + (eq (selected-window) +modeline-current-window)) + +;; Ensure modeline is inactive when Emacs is unfocused (and active otherwise) +(defvar +modeline-remap-face-cookie nil) + +(defun +modeline|focus () + (when +modeline-remap-face-cookie + (require 'face-remap) + (face-remap-remove-relative +modeline-remap-face-cookie))) +(add-hook 'focus-in-hook #'+modeline|focus) + +(defun +modeline|unfocus () + (setq +modeline-remap-face-cookie (face-remap-add-relative 'mode-line 'mode-line-inactive))) +(add-hook 'focus-out-hook #'+modeline|unfocus) + + +;; +;; Helpers +;; + +(defun +modeline--make-xpm (width height &optional color) + "Create an XPM bitmap. Inspired by `powerline''s `pl/make-xpm'." + (propertize + " " 'display + (let ((data (make-list height (make-list width 1))) + (color (or color "None"))) + (ignore-errors + (create-image + (concat + (format "/* XPM */\nstatic char * percent[] = {\n\"%i %i 2 1\",\n\". c %s\",\n\" c %s\"," + (length (car data)) (length data) color color) + (cl-loop with idx = 0 + with len = (length data) + for dl in data + do (cl-incf idx) + concat "\"" + concat (cl-loop for d in dl + if (= d 0) collect (string-to-char " ") + else collect (string-to-char ".")) + concat (if (eq idx len) "\"};" "\",\n"))) + 'xpm t :ascent 'center))))) + +(defun +modeline-file-path (&optional path) + (let ((buffer-file-name (or path buffer-file-name)) + (root (doom-project-root))) + (cond ((null root) + (propertize "%b" 'face 'doom-modeline-buffer-file)) + ((or (null buffer-file-name) + (directory-name-p buffer-file-name)) + (propertize (abbreviate-file-name (or buffer-file-name default-directory)) + 'face 'doom-modeline-buffer-path)) + ((let* ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified)) + (true-filename (file-truename buffer-file-name)) + (relative-dirs (file-relative-name (file-name-directory true-filename) + (concat root "../"))) + (relative-faces (or modified-faces 'doom-modeline-buffer-path)) + (file-faces (or modified-faces 'doom-modeline-buffer-file))) + (if (equal "./" relative-dirs) (setq relative-dirs "")) + (concat (propertize relative-dirs 'face (if relative-faces `(:inherit ,relative-faces))) + (propertize (file-name-nondirectory true-filename) + 'face (if file-faces `(:inherit ,file-faces))))))))) + +;; TODO Add shrink-path alternatives + + +;; +;; Bars +;; + +(defvar +modeline-bar-active nil "TODO") +(defvar +modeline-bar-inactive nil "TODO") +(defun +modeline|setup-bars () + (setq +modeline-bar-active + (+modeline--make-xpm 3 +modeline-height (face-background 'doom-modeline-bar)) + +modeline-bar-inactive + (+modeline--make-xpm 3 +modeline-height))) +(add-hook 'doom-load-theme-hook #'+modeline|setup-bars) + +(defun +modeline|setup-bars-after-change (_sym val op _where) + (when (eq op 'set) + (let ((+modeline-height val)) + (+modeline|setup-bars)))) +(add-variable-watcher '+modeline-height #'+modeline|setup-bars-after-change) + +(def-modeline-segment! +modeline-bar + (if (active) +modeline-bar-active +modeline-bar-inactive)) + + +;; +;; Segments +;; + +(defun +modeline|update-on-change () + (+modeline--set-+modeline-buffer-state) + (remove-hook 'post-command-hook #'+modeline|update-on-change t)) +(defun +modeline|start-update-on-change () + (add-hook 'post-command-hook #'+modeline|update-on-change nil t)) +(add-hook 'first-change-hook #'+modeline|start-update-on-change) + +(advice-add #'undo :after #'+modeline--set-+modeline-buffer-state) +(advice-add #'undo-tree-undo :after #'+modeline--set-+modeline-buffer-state) + +(def-modeline-segment! +modeline-buffer-state + :on-hooks (find-file-hook + read-only-mode-hook + after-change-functions + after-save-hook + after-revert-hook) + (let ((icon (cond (buffer-read-only + (all-the-icons-octicon + "lock" + :face 'doom-modeline-warning + :v-adjust -0.05)) + ((buffer-modified-p) + (all-the-icons-faicon + "floppy-o" + :face 'doom-modeline-buffer-modified + :v-adjust -0.05)) + ((and buffer-file-name (not (file-exists-p buffer-file-name))) + (all-the-icons-octicon + "circle-slash" + :face 'doom-modeline-urgent + :v-adjust -0.05))))) + (if icon (concat icon " ")))) + +(def-modeline-segment! +modeline-buffer-id + :on-hooks (find-file-hook after-save-hook after-revert-hook) + :faces t + (if buffer-file-name + (funcall +modeline-buffer-path-function buffer-file-name) + "%b")) + +(def-modeline-segment! +modeline-buffer-directory + (let ((face (if (active) 'doom-modeline-buffer-path))) + (concat (if (display-graphic-p) " ") + (all-the-icons-octicon + "file-directory" + :face face + :v-adjust -0.1 + :height 1.25) + " " + (propertize (abbreviate-file-name default-directory) + 'face face)))) + +(def-modeline-segment! +modeline-vcs + :on-set (vc-mode) + (when (and vc-mode buffer-file-name) + (let* ((backend (vc-backend buffer-file-name)) + (state (vc-state buffer-file-name backend))) + (let ((face 'mode-line-inactive) + (active (active)) + (all-the-icons-default-adjust -0.1)) + (concat " " + (cond ((memq state '(edited added)) + (if active (setq face 'doom-modeline-info)) + (all-the-icons-octicon + "git-compare" + :face face + :v-adjust -0.05)) + ((eq state 'needs-merge) + (if active (setq face 'doom-modeline-info)) + (all-the-icons-octicon "git-merge" :face face)) + ((eq state 'needs-update) + (if active (setq face 'doom-modeline-warning)) + (all-the-icons-octicon "arrow-down" :face face)) + ((memq state '(removed conflict unregistered)) + (if active (setq face 'doom-modeline-urgent)) + (all-the-icons-octicon "alert" :face face)) + (t + (if active (setq face 'font-lock-doc-face)) + (all-the-icons-octicon + "git-compare" + :face face + :v-adjust -0.05))) + " " + (propertize (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2)) + 'face (if active face)) + " "))))) + +(def-modeline-segment! +modeline-encoding + :on-hooks (after-revert-hook after-save-hook find-file-hook) + :on-set (buffer-file-coding-system) + (concat (pcase (coding-system-eol-type buffer-file-coding-system) + (0 "LF ") + (1 "CRLF ") + (2 "CR ")) + (let ((sys (coding-system-plist buffer-file-coding-system))) + (if (memq (plist-get sys :category) '(coding-category-undecided coding-category-utf-8)) + "UTF-8" + (upcase (symbol-name (plist-get sys :name))))) + " ")) + +(def-modeline-segment! +modeline-major-mode + :on-set (mode-name) + :faces t + (propertize (format-mode-line mode-name) + 'face 'doom-modeline-buffer-major-mode)) + +(defun +modeline--macro-recording () + "Display current Emacs or evil macro being recorded." + (when (and (active) (or defining-kbd-macro executing-kbd-macro)) + (let ((sep (propertize " " 'face 'doom-modeline-panel))) + (concat sep + (propertize (if (bound-and-true-p evil-this-macro) + (char-to-string evil-this-macro) + "Macro") + 'face 'doom-modeline-panel) + sep + (all-the-icons-octicon "triangle-right" + :face 'doom-modeline-panel + :v-adjust -0.05) + sep)))) + +(defsubst +modeline--anzu () + "Show the match index and total number thereof. Requires `anzu', also +`evil-anzu' if using `evil-mode' for compatibility with `evil-search'." + (when (and anzu--state (not iedit-mode)) + (propertize + (let ((here anzu--current-position) + (total anzu--total-matched)) + (cond ((eq anzu--state 'replace-query) + (format " %d replace " total)) + ((eq anzu--state 'replace) + (format " %d/%d " here total)) + (anzu--overflow-p + (format " %s+ " total)) + ((format " %s/%d " here total)))) + 'face (if (active) 'doom-modeline-panel)))) + +(defsubst +modeline--evil-substitute () + "Show number of matches for evil-ex substitutions and highlights in real time." + (when (and evil-mode + (or (assq 'evil-ex-substitute evil-ex-active-highlights-alist) + (assq 'evil-ex-global-match evil-ex-active-highlights-alist) + (assq 'evil-ex-buffer-match evil-ex-active-highlights-alist))) + (propertize + (let ((range (if evil-ex-range + (cons (car evil-ex-range) (cadr evil-ex-range)) + (cons (line-beginning-position) (line-end-position)))) + (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2)))) + (if pattern + (format " %s matches " (how-many pattern (car range) (cdr range))) + " - ")) + 'face (if (active) 'doom-modeline-panel)))) + +(defun doom-themes--overlay-sort (a b) + (< (overlay-start a) (overlay-start b))) + +(defsubst +modeline--iedit () + "Show the number of iedit regions matches + what match you're on." + (when (and iedit-mode iedit-occurrences-overlays) + (propertize + (let ((this-oc (or (let ((inhibit-message t)) + (iedit-find-current-occurrence-overlay)) + (progn (iedit-prev-occurrence) + (iedit-find-current-occurrence-overlay)))) + (length (length iedit-occurrences-overlays))) + (format " %s/%d " + (if this-oc + (- length + (length (memq this-oc (sort (append iedit-occurrences-overlays nil) + #'doom-themes--overlay-sort))) + -1) + "-") + length)) + 'face (if (active) 'doom-modeline-panel)))) + +(def-modeline-segment! +modeline-matches + "Displays: 1. the currently recording macro, 2. A current/total for the +current search term (with anzu), 3. The number of substitutions being conducted +with `evil-ex-substitute', and/or 4. The number of active `iedit' regions." + (let ((meta (concat (+modeline--macro-recording) + (+modeline--anzu) + (+modeline--evil-substitute) + (+modeline--iedit) + " "))) + (or (and (not (equal meta " ")) meta) + (if buffer-file-name " %I ")))) + +;; +(defsubst doom-column (pos) + (save-excursion (goto-char pos) + (current-column))) + +(defvar-local +modeline-enable-word-count nil + "If non-nil, a word count will be added to the selection-info modeline +segment.") + +(defun +modeline|enable-word-count () + (setq +modeline-enable-word-count t)) +(add-hook 'text-mode-hook #'+modeline|enable-word-count) + +(def-modeline-segment! +modeline-selection-info + (let ((beg (or evil-visual-beginning (region-beginning))) + (end (or evil-visual-end (region-end)))) + (propertize + (let ((lines (count-lines beg (min end (point-max))))) + (concat (cond ((or (bound-and-true-p rectangle-mark-mode) + (eq 'block evil-visual-selection)) + (let ((cols (abs (- (doom-column end) + (doom-column beg))))) + (format "%dx%dB" lines cols))) + ((eq evil-visual-selection 'line) + (format "%dL" lines)) + ((> lines 1) + (format "%dC %dL" (- end beg) lines)) + ((format "%dC" (- end beg)))) + (when +modeline-enable-word-count + (format " %dW" (count-words beg end))))) + 'face 'doom-modeline-highlight))) + +(defun +modeline|enable-selection-info () + (add-to-list '+modeline-format-left '+modeline-selection-info t #'eq)) +(defun +modeline|disable-selection-info () + (setq +modeline-format-left (delq '+modeline-selection-info +modeline-format-left))) +(cond ((featurep 'evil) + (add-hook 'evil-visual-state-entry-hook #'+modeline|enable-selection-info) + (add-hook 'evil-visual-state-exit-hook #'+modeline|disable-selection-info)) + ((add-hook 'activate-mark-hook #'+modeline|enable-selection-info) + (add-hook 'deactivate-mark-hook #'+modeline|disable-selection-info))) + + +;; +;; Preset modeline formats +;; + +(def-modeline-format! :main + '(+modeline-matches " " + +modeline-buffer-state + +modeline-buffer-id + " %2l:%c %p ") + '(+modeline-encoding + +modeline-major-mode + +modeline-vcs)) + +(def-modeline-format! :minimal + '(+modeline-matches " " + +modeline-buffer-state + +modeline-buffer-id) + '(+modeline-major-mode)) + +(def-modeline-format! :special + '(+modeline-matches +modeline-buffer-state " %b " +modeline-buffer-position) + '(+modeline-encoding +modeline-major-mode)) + +(def-modeline-format! :project + '(+modeline-buffer-directory) + '(+modeline-major-mode)) + + +;; +;; +;; + +(def-modeline-segment! +modeline--rest + (let ((rhs-str (format-mode-line +modeline-format-right))) + (list (propertize + " " 'display + `((space :align-to (- (+ right right-fringe right-margin) + ,(1+ (string-width rhs-str)))))) + rhs-str))) + +(setq-default mode-line-format '("" +modeline-bar +modeline-format-left +modeline--rest)) + + +;; +(set-modeline! :main t) +(add-hook! '+doom-dashboard-mode-hook (set-modeline! :project)) +(add-hook! 'doom-scratch-buffer-hook (set-modeline! :special)) diff --git a/modules/ui/modeline/packages.el b/modules/ui/modeline/packages.el new file mode 100644 index 000000000..e82f1e343 --- /dev/null +++ b/modules/ui/modeline/packages.el @@ -0,0 +1,20 @@ +;; -*- no-byte-compile: t; -*- +;;; ui/modeline/packages.el + +;;; These are the invisible dependencies +;; Required +;;(require 'evil) +;;(require 'projectile) +;;(require 'all-the-icons) + +;; Optional +;;(require 'flycheck) +;;(require 'iedit) +;;(require 'evil-multiedit) + +(package! anzu) + +(when (featurep! :feature evil) + (package! evil-anzu)) + +;; TODO (package! shrink-path)