e05e452528
With https://github.com/Alexander-Miller/treemacs/issues/592 merged, treemacs now fully supports perspective mode. That is, each treemacs buffer is scoped to a perspective and initializes itself using projectile. This change re-enables treemacs-persp, enables the `Perspectives` scope, and adjusts the doom treemacs init behavior to support the new treemacs-persp behavior. I haven't been able to reproduce the prior errors with melpa so I think this is safe to re-enable now. In my testing it seems to work flawlessly, both with and without persp-mode enabled. Only one issue is that users might need to remove their treemacs persist file (`~/.emacs.d/.local/cache/treemacs-persist`) after this change if using persp-mode. I'm not sure if it is necessary since I blew away my own before testing.
73 lines
2.1 KiB
EmacsLisp
73 lines
2.1 KiB
EmacsLisp
;;; ui/treemacs/config.el -*- lexical-binding: t; -*-
|
|
|
|
(defvar +treemacs-git-mode 'simple
|
|
"Type of git integration for `treemacs-git-mode'.
|
|
|
|
There are 3 possible values:
|
|
|
|
1) `simple', which highlights only files based on their git status, and is
|
|
slightly faster,
|
|
2) `extended', which highlights both files and directories, but requires
|
|
python,
|
|
3) `deferred', same as extended, but highlights asynchronously.
|
|
|
|
This must be set before `treemacs' has loaded.")
|
|
|
|
|
|
;;
|
|
;;; Packages
|
|
|
|
(use-package! treemacs
|
|
:defer t
|
|
:init
|
|
(setq treemacs-follow-after-init t
|
|
treemacs-is-never-other-window t
|
|
treemacs-sorting 'alphabetic-case-insensitive-asc
|
|
treemacs-persist-file (concat doom-cache-dir "treemacs-persist")
|
|
treemacs-last-error-persist-file (concat doom-cache-dir "treemacs-last-error-persist"))
|
|
:config
|
|
;; Allow ace-window to target treemacs windows
|
|
(after! ace-window
|
|
(delq! 'treemacs-mode aw-ignored-buffers))
|
|
|
|
;; Don't follow the cursor
|
|
(treemacs-follow-mode -1)
|
|
|
|
(when +treemacs-git-mode
|
|
;; If they aren't supported, fall back to simpler methods
|
|
(when (and (memq +treemacs-git-mode '(deferred extended))
|
|
(not (executable-find "python3")))
|
|
(setq +treemacs-git-mode 'simple))
|
|
(treemacs-git-mode +treemacs-git-mode)
|
|
(setq treemacs-collapse-dirs
|
|
(if (memq treemacs-git-mode '(extended deferred))
|
|
3
|
|
0))))
|
|
|
|
|
|
(use-package! treemacs-evil
|
|
:when (featurep! :editor evil +everywhere)
|
|
:after treemacs
|
|
:config
|
|
(define-key! evil-treemacs-state-map
|
|
[return] #'treemacs-RET-action
|
|
[tab] #'treemacs-TAB-action
|
|
"TAB" #'treemacs-TAB-action
|
|
;; REVIEW Fix #1875 to be consistent with C-w {v,s}, but this should really
|
|
;; be considered upstream.
|
|
"o v" #'treemacs-visit-node-horizontal-split
|
|
"o s" #'treemacs-visit-node-vertical-split))
|
|
|
|
|
|
(use-package! treemacs-projectile
|
|
:after treemacs)
|
|
|
|
|
|
(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))
|