diff options
| -rw-r--r-- | users/tazjin/emacs/config/init.el | 3 | ||||
| -rw-r--r-- | users/tazjin/emacs/config/look-and-feel.el | 24 | ||||
| -rw-r--r-- | users/tazjin/emacs/config/mail-setup.el | 8 | ||||
| -rw-r--r-- | users/tazjin/emacs/default.nix | 1 |
4 files changed, 5 insertions, 31 deletions
diff --git a/users/tazjin/emacs/config/init.el b/users/tazjin/emacs/config/init.el index 3f9acd846309..7233ec9c6d6b 100644 --- a/users/tazjin/emacs/config/init.el +++ b/users/tazjin/emacs/config/init.el @@ -76,8 +76,6 @@ (use-package rainbow-mode) (use-package s) (use-package string-edit-at-point) - -(use-package telephone-line) ;; configuration happens outside of use-package (use-package term-switcher) (use-package undo-tree @@ -256,7 +254,6 @@ modes bindings eshell-setup)) -(telephone-line-setup) (ace-window-display-mode) ;; If a local configuration library exists, it should be loaded. diff --git a/users/tazjin/emacs/config/look-and-feel.el b/users/tazjin/emacs/config/look-and-feel.el index 119922173bef..b771b4cd03b9 100644 --- a/users/tazjin/emacs/config/look-and-feel.el +++ b/users/tazjin/emacs/config/look-and-feel.el @@ -23,7 +23,7 @@ (setq default-frame-alist `((font . ,font))) (set-frame-font font t t)) -;; Configure telephone-line +;; Configure the modeline ;; Implements a mode-line warning if there are any logged in TTY ;; sessions apart from the graphical one. @@ -41,6 +41,8 @@ (defvar cached-tty-sessions (cons (time-convert nil 'integer) (list-tty-sessions)) "Cached TTY session value to avoid running the command too often.") +;; TODO(tazjin): add this to the modeline + (defun get-cached-tty-sessions () (let ((time )) (when (< 30 @@ -51,26 +53,6 @@ (cdr cached-tty-sessions)) -(telephone-line-defsegment telephone-line-warn-tty-session () - (when-let (sessions (get-cached-tty-sessions)) - (format "W: [%s]!!" (s-join "," sessions)))) - -(defun telephone-line-setup () - (setq telephone-line-lhs - '((highlight . (telephone-line-warn-tty-session)) - (nil . (telephone-line-position-segment)) - (accent . (telephone-line-buffer-segment)))) - - (setq telephone-line-rhs - '((accent . (telephone-line-major-mode-segment)))) - - (setq telephone-line-primary-left-separator 'telephone-line-tan-left - telephone-line-primary-right-separator 'telephone-line-tan-right - telephone-line-secondary-left-separator 'telephone-line-tan-hollow-left - telephone-line-secondary-right-separator 'telephone-line-tan-hollow-right) - - (telephone-line-mode 1)) - ;; Auto refresh buffers (global-auto-revert-mode 1) diff --git a/users/tazjin/emacs/config/mail-setup.el b/users/tazjin/emacs/config/mail-setup.el index 1d7ab6d0b018..7352c8ba109b 100644 --- a/users/tazjin/emacs/config/mail-setup.el +++ b/users/tazjin/emacs/config/mail-setup.el @@ -49,7 +49,7 @@ ;; handle that gracefully. (define-key notmuch-message-mode-map (kbd "C-x C-s") #'ignore) -;; Define a telephone-line segment for displaying the count of unread, +;; Define a mode-line segment for displaying the count of unread, ;; important mails in the last window's mode-line: (defvar *last-notmuch-count-redraw* 0) (defvar *current-notmuch-count* nil) @@ -74,10 +74,6 @@ (not (equal *current-notmuch-count* "I: 0; D: 0"))) *current-notmuch-count*)) -(telephone-line-defsegment telephone-line-notmuch-counts () - "This segment displays the count of unread notmuch messages in - the last window's mode-line (if unread messages are present)." - - (update-display-notmuch-counts)) +;; TODO(tazjin): re-add this segment to the modeline (provide 'mail-setup) diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 24068d68691d..12f5ac21f93f 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -88,7 +88,6 @@ pkgs.makeOverridable rust-mode sly string-edit-at-point - telephone-line terraform-mode undo-tree uuidgen |