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

Mode-line: shorter path in thin windows + remove buffer-size

Browse source
This commit is contained in:
Henrik Lissner 2016-04-12 15:57:20 -04:00
parent 4a8ec6f7d7
commit f212d0bb46
1 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

55
core/core-ui.el
View file

@ -258,15 +258,11 @@
(if buffer-file-name (if buffer-file-name
(let* ((project-path (let (projectile-require-project-root) (projectile-project-root))) (let* ((project-path (let (projectile-require-project-root) (projectile-project-root)))
(buffer-path (f-relative buffer-file-name project-path)) (buffer-path (f-relative buffer-file-name project-path))
(max-length (truncate (/ (window-width) 1.75))) (max-length (truncate (/ (window-width) 2)))
(path-len (length buffer-path))) (path-len (length buffer-path)))
(concat (file-name-nondirectory (directory-file-name project-path)) (if (> path-len max-length)
"/" (f-filename buffer-path)
(if (> path-len max-length) (concat (f-filename project-path) "/" buffer-path)))
(concat "…" (replace-regexp-in-string
"^.*?/" "/"
(substring buffer-path (- path-len max-length) path-len)))
buffer-path)))
"%b") "%b")
:face (if active 'mode-line-buffer-file 'mode-line-inactive) :face (if active 'mode-line-buffer-file 'mode-line-inactive)
:skip-alternate t :skip-alternate t
@ -397,11 +393,6 @@ anzu to be enabled."
(if (stringp mode-line-process) mode-line-process))) (if (stringp mode-line-process) mode-line-process)))
:tight-right t) :tight-right t)
(spaceline-define-segment *buffer-size
(powerline-buffer-size)
:tight-right t
:skip-alternate t)
(defun narf--col-at-pos (pos) (defun narf--col-at-pos (pos)
(save-excursion (goto-char pos) (current-column))) (save-excursion (goto-char pos) (current-column)))
(spaceline-define-segment *selection-info (spaceline-define-segment *selection-info
@ -474,25 +465,27 @@ Supports both Emacs and Evil cursor conventions."
(powerline-hud (if active 'spaceline-highlight-face 'region) line-face 1) (powerline-hud (if active 'spaceline-highlight-face 'region) line-face 1)
:tight-right t) :tight-right t)
(defun narf-spaceline-init ()
(spaceline-install
;; Left side
'(*macro-recording
(*anzu *iedit *evil-substitute *flycheck)
(*buffer-path *remote-host)
*buffer-modified
*vc
)
;; Right side
'(*selection-info
*buffer-encoding-abbrev
*major-mode
*env-version
(global :when active)
("%l/%c" *buffer-position)
*hud
)))
;; Initialize modeline ;; Initialize modeline
(spaceline-install (narf-spaceline-init))
;; Left side
'(*macro-recording
((*anzu *iedit *evil-substitute *flycheck)
:fallback *buffer-size)
(*buffer-path *remote-host)
*buffer-modified
*vc
)
;; Right side
'(*selection-info
*buffer-encoding-abbrev
*major-mode
*env-version
(global :when active)
("%l/%c" *buffer-position)
*hud
)))
(provide 'core-ui) (provide 'core-ui)
;;; core-ui.el ends here ;;; core-ui.el ends here