diff --git a/modules/ui/treemacs/autoload.el b/modules/ui/treemacs/autoload.el index 6f8b75a9c..a11fa2de6 100644 --- a/modules/ui/treemacs/autoload.el +++ b/modules/ui/treemacs/autoload.el @@ -6,8 +6,9 @@ (cl-letf (((symbol-function 'treemacs-workspace->is-empty?) (symbol-function 'ignore))) (treemacs--init)) - (dolist (project (treemacs-workspace->projects (treemacs-current-workspace))) - (treemacs-do-remove-project-from-workspace project)) + (unless (bound-and-true-p persp-mode) + (dolist (project (treemacs-workspace->projects (treemacs-current-workspace))) + (treemacs-do-remove-project-from-workspace project))) (with-current-buffer origin-buffer (let ((project-root (or (doom-project-root) default-directory))) (treemacs-do-add-project-to-workspace diff --git a/modules/ui/treemacs/config.el b/modules/ui/treemacs/config.el index 6f8a2d920..538fc6c28 100644 --- a/modules/ui/treemacs/config.el +++ b/modules/ui/treemacs/config.el @@ -66,3 +66,8 @@ This must be set before `treemacs' has loaded.") (use-package! treemacs-magit :when (featurep! :tools magit) :after treemacs magit) + +(use-package! treemacs-persp + :when (featurep! :ui workspaces) + :after (treemacs persp-mode) + :config (treemacs-set-scope-type 'Perspectives)) diff --git a/modules/ui/treemacs/packages.el b/modules/ui/treemacs/packages.el index a95c99aea..43e8c6b0d 100644 --- a/modules/ui/treemacs/packages.el +++ b/modules/ui/treemacs/packages.el @@ -7,3 +7,5 @@ (package! treemacs-projectile) (when (featurep! :tools magit) (package! treemacs-magit)) +(when (featurep! :ui workspaces) + (package! treemacs-persp))