From 8c0561df932a2c36d81a79dd19173efe90aa1b57 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 30 Dec 2019 00:49:32 -0500 Subject: [PATCH] Fix ui/tabs module Remove all my custom hacks because none of them work anymore. --- modules/ui/tabs/config.el | 69 +++++---------------------------------- 1 file changed, 9 insertions(+), 60 deletions(-) diff --git a/modules/ui/tabs/config.el b/modules/ui/tabs/config.el index ff2b0f780..1ac654d6f 100644 --- a/modules/ui/tabs/config.el +++ b/modules/ui/tabs/config.el @@ -3,69 +3,18 @@ (use-package! centaur-tabs :after-call after-find-file dired-initial-position-hook :init - (setq centaur-tabs-height 28 + (setq centaur-tabs-set-icons t + centaur-tabs-gray-out-icons 'buffer centaur-tabs-set-bar 'left - centaur-tabs-set-modified-marker t) + centaur-tabs-set-modified-marker t + centaur-tabs-close-button "✕" + centaur-tabs-modified-marker "⬤") :config - (add-hook! 'centaur-tabs-mode-hook - (defun +tabs-init-frames-h () - (dolist (frame (frame-list)) - (if (not centaur-tabs-mode) - (set-frame-parameter frame 'buffer-predicate (frame-parameter frame 'old-buffer-predicate)) - (set-frame-parameter frame 'old-buffer-predicate (frame-parameter frame 'buffer-predicate)) - (set-frame-parameter frame 'buffer-predicate #'+tabs-buffer-predicate))))) - - (add-to-list 'window-persistent-parameters '(tab-buffers . t)) - - (defun +tabs-window-buffer-list-fn () - (centaur-tabs-filter-out - 'centaur-tabs-hide-tab-cached - (delq nil - (cl-mapcar #'(lambda (b) - (cond - ;; Always include the current buffer. - ((eq (current-buffer) b) b) - ((buffer-file-name b) b) - ((char-equal ?\ (aref (buffer-name b) 0)) nil) - ((buffer-live-p b) b))) - (window-parameter nil 'tab-buffers))))) - - (defun +tabs-buffer-groups-fn () - (list - (cond ((or (string-equal "*" (substring (buffer-name) 0 1)) - (memq major-mode '(magit-process-mode - magit-status-mode - magit-diff-mode - magit-log-mode - magit-file-mode - magit-blob-mode - magit-blame-mode - ))) - "Emacs") - ((derived-mode-p 'eshell-mode) - "EShell") - ((derived-mode-p 'dired-mode) - "Dired") - ((centaur-tabs-get-group-name (current-buffer)))))) - - (setq centaur-tabs-buffer-list-function #'+tabs-window-buffer-list-fn - centaur-tabs-buffer-groups-function #'+tabs-buffer-groups-fn) - - (advice-add #'centaur-tabs-buffer-close-tab :override #'+tabs-kill-tab-maybe-a) - (advice-add #'bury-buffer :around #'+tabs-bury-buffer-a) - (advice-add #'kill-current-buffer :before #'+tabs-kill-current-buffer-a) - (add-hook 'doom-switch-buffer-hook #'+tabs-add-buffer-h) - (add-hook 'doom-switch-window-hook #'+tabs-new-window-h) - (add-hook '+doom-dashboard-mode-hook #'centaur-tabs-local-mode) - (map! (:map centaur-tabs-mode-map - [remap delete-window] #'+tabs/close-tab-or-window - [remap +workspace/close-window-or-workspace] #'+tabs/close-tab-or-window) - (:after persp-mode - :map persp-mode-map - [remap delete-window] #'+tabs/close-tab-or-window - [remap +workspace/close-window-or-workspace] #'+tabs/close-tab-or-window)) - (centaur-tabs-mode +1)) + + +;; TODO tab-bar-mode (emacs 27) +;; TODO tab-line-mode (emacs 27)