From 32f108506db2352e69acd589a847b672ed879645 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:15:19 +0100 Subject: [PATCH 1/5] Re-enable `doom-modeline` in `treemacs` The current `doom-modeline` shows the current workspace name in `treemacs` since https://github.com/Alexander-Miller/treemacs/pull/1049, thus making the `doom-modeline` useful again. --- extensions/doom-themes-ext-treemacs.el | 6 ------ 1 file changed, 6 deletions(-) diff --git a/extensions/doom-themes-ext-treemacs.el b/extensions/doom-themes-ext-treemacs.el index d4662296..20a3046a 100644 --- a/extensions/doom-themes-ext-treemacs.el +++ b/extensions/doom-themes-ext-treemacs.el @@ -86,9 +86,6 @@ Only takes effect if `doom-themes-treemacs-enable-variable-pitch' is non-nil." "Set `line-spacing' in treemacs buffers." (setq line-spacing doom-themes-treemacs-line-spacing)) -(defun doom-themes-hide-modeline () - (setq mode-line-format nil)) - (defun doom-themes-enable-treemacs-variable-pitch-labels (&rest _) (when doom-themes-treemacs-enable-variable-pitch (dolist (face '(treemacs-root-face @@ -129,9 +126,6 @@ Only takes effect if `doom-themes-treemacs-enable-variable-pitch' is non-nil." ;; Fix #293: tabs messing up formatting in `treemacs-icons-dired-mode' (add-hook 'treemacs-icons-dired-mode-hook #'doom-themes-fix-treemacs-icons-dired-mode) - ;; The modeline isn't useful in treemacs - (add-hook 'treemacs-mode-hook #'doom-themes-hide-modeline) - ;; Disable fringes (and reset them everytime treemacs is selected because it ;; may change due to outside factors) (add-hook 'treemacs-mode-hook #'doom-themes-hide-fringes-maybe) From cb64e957d7a584ba713e421d80c66facd2a1f7b9 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Sun, 31 Mar 2024 10:44:32 +0200 Subject: [PATCH 2/5] Add defcustom --- extensions/doom-themes-ext-treemacs.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extensions/doom-themes-ext-treemacs.el b/extensions/doom-themes-ext-treemacs.el index 20a3046a..078d8291 100644 --- a/extensions/doom-themes-ext-treemacs.el +++ b/extensions/doom-themes-ext-treemacs.el @@ -26,6 +26,11 @@ See `doom-themes-treemacs-variable-pitch-face'." :type 'boolean :group 'doom-themes-treemacs) +(defcustom doom-themes-treemacs-hide-modelone t + "If non-nil, hide the modeline in treemacs buffer." + :type 'boolean + :group 'doom-themes-treemacs) + (defcustom doom-themes-treemacs-line-spacing 1 "Line-spacing for treemacs buffer." :type 'integer From d70ef03db04e857a0f40552d730d9fd25dceddc2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Sun, 31 Mar 2024 10:46:31 +0200 Subject: [PATCH 3/5] Update doom-themes-ext-treemacs.el --- extensions/doom-themes-ext-treemacs.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/extensions/doom-themes-ext-treemacs.el b/extensions/doom-themes-ext-treemacs.el index 078d8291..971a38d1 100644 --- a/extensions/doom-themes-ext-treemacs.el +++ b/extensions/doom-themes-ext-treemacs.el @@ -26,16 +26,16 @@ See `doom-themes-treemacs-variable-pitch-face'." :type 'boolean :group 'doom-themes-treemacs) -(defcustom doom-themes-treemacs-hide-modelone t - "If non-nil, hide the modeline in treemacs buffer." - :type 'boolean - :group 'doom-themes-treemacs) - (defcustom doom-themes-treemacs-line-spacing 1 "Line-spacing for treemacs buffer." :type 'integer :group 'doom-themes-treemacs) +(defcustom doom-themes-treemacs-hide-modelone t + "If non-nil, hide the modeline in treemacs buffer." + :type 'boolean + :group 'doom-themes-treemacs) + (defcustom doom-themes-treemacs-theme "doom-atom" "Default treemacs theme." :type '(radio (const :doc "A minimalistic atom-inspired icon theme" "doom-atom") @@ -91,6 +91,10 @@ Only takes effect if `doom-themes-treemacs-enable-variable-pitch' is non-nil." "Set `line-spacing' in treemacs buffers." (setq line-spacing doom-themes-treemacs-line-spacing)) +(defun doom-themes-hide-modeline () + (when doom-themes-treemacs-hide-modeline + (setq mode-line-format nil))) + (defun doom-themes-enable-treemacs-variable-pitch-labels (&rest _) (when doom-themes-treemacs-enable-variable-pitch (dolist (face '(treemacs-root-face From 094246f128eb64d3d4f45565658452cc9f28e5a7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Sun, 31 Mar 2024 10:47:54 +0200 Subject: [PATCH 4/5] Update doom-themes-ext-treemacs.el --- extensions/doom-themes-ext-treemacs.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/doom-themes-ext-treemacs.el b/extensions/doom-themes-ext-treemacs.el index 971a38d1..b6e0afe7 100644 --- a/extensions/doom-themes-ext-treemacs.el +++ b/extensions/doom-themes-ext-treemacs.el @@ -135,6 +135,8 @@ Only takes effect if `doom-themes-treemacs-enable-variable-pitch' is non-nil." ;; Fix #293: tabs messing up formatting in `treemacs-icons-dired-mode' (add-hook 'treemacs-icons-dired-mode-hook #'doom-themes-fix-treemacs-icons-dired-mode) + (add-hook 'treemacs-mode-hook #'doom-themes-hide-modeline) + ;; Disable fringes (and reset them everytime treemacs is selected because it ;; may change due to outside factors) (add-hook 'treemacs-mode-hook #'doom-themes-hide-fringes-maybe) From f764dea234bd2c83a6187bd39c9b9829a12eeee1 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Sun, 31 Mar 2024 10:48:16 +0200 Subject: [PATCH 5/5] Update doom-themes-ext-treemacs.el --- extensions/doom-themes-ext-treemacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/doom-themes-ext-treemacs.el b/extensions/doom-themes-ext-treemacs.el index b6e0afe7..45aa2e83 100644 --- a/extensions/doom-themes-ext-treemacs.el +++ b/extensions/doom-themes-ext-treemacs.el @@ -31,7 +31,7 @@ See `doom-themes-treemacs-variable-pitch-face'." :type 'integer :group 'doom-themes-treemacs) -(defcustom doom-themes-treemacs-hide-modelone t +(defcustom doom-themes-treemacs-hide-modeline t "If non-nil, hide the modeline in treemacs buffer." :type 'boolean :group 'doom-themes-treemacs)