Commit graph

52 commits

Author SHA1 Message Date
Henrik Lissner
7acfb0c77c
nit: minor comment reformatting & revision 2024-03-26 10:39:24 -04:00
Henrik Lissner
90f90fb34d
fix(treemacs): simplify lsp-treemacs load-order
dec058f fixed the load order between treemacs-nerd-icons and
lsp-treemacs, but lsp-treemacs still loads so late that folks will see a
theme-less Treemacs until they visit their first lsp-mode-enabled file.
This ensures that won't happen.

Amend: dec058fabb
Amend: #7519
2024-03-13 01:00:38 -04:00
Henrik Lissner
dec058fabb
fix(treemacs): treemacs-nerd-icons load order w/ +lsp
lsp-treemacs changes the default Treemacs theme, so treemacs-nerd-icons
needs to be loaded after it, if it's installed/enabled.

Fix: #7519
Fix: doomemacs/themes#801
Ref: emacs-lsp/lsp-treemacs#89
2024-03-11 00:53:44 -04:00
Kiana Sheibani
c3b228fedd fix(treemacs): do not overwrite git mode when treemacs-python-executable is set 2023-11-23 21:19:26 -05:00
Henrik Lissner
57965f18a5
fix(treemacs): replace all-the-icons with nerd-icons
Ref: #7411
Close: #7428
Ref: https://discourse.doomemacs.org/t/4147
2023-09-15 21:24:45 +02:00
David Adams
8be11ff48c fix(treemacs): ignore default popup rules
Fix: #7128
2023-03-08 20:24:44 -05:00
毕达哥拉斯
2c31028a56
fix(treemacs): treemacs-collapse-dirs not changing
`treemacs-collapse-dirs` cannot be changed by setting
`+treemacs-git-mode` to `extended` or `deferred`

Fix: #6850
2022-09-30 22:39:24 +02:00
Henrik Lissner
ad6a3d0f33
refactor: deprecate featurep! for modulep!
featurep! will be renamed modulep! in the future, so it's been
deprecated. They have identical interfaces, and can be replaced without
issue.

featurep! was never quite the right name for this macro. It implied that
it had some connection to featurep, which it doesn't (only that it was
similar in purpose; still, Doom modules are not features). To undo such
implications and be consistent with its namespace (and since we're
heading into a storm of breaking changes with the v3 release anyway),
now was the best opportunity to begin the transition.
2022-08-14 20:43:35 +02:00
Henrik Lissner
8f69474e56 fix(treemacs): remove defunct ace-window advice
This advise has been defunct since f6de662.

Fix #5516
Ref f6de662011
2021-09-24 23:41:42 +02:00
Henrik Lissner
06392a723f refactor: rename orig-fn arg in advice to fn
A minor tweak to our naming conventions for the first argument of an
:around advice.
2021-08-04 01:53:12 -04:00
Henrik Lissner
5da0408e4f Add :T for treemacs state keybinds in map! 2021-05-23 22:09:07 -04:00
Henrik Lissner
b9e0ee2954 Revert 5c46a5e68 & fix treemacs-evil load order
I misunderstood the purpose of the new keybinds. They are actually fine.

Also fixes the config load order for treemacs-evil caused by weird
use-package + :after semantics.

Closes #5056
2021-05-15 17:33:37 -04:00
Henrik Lissner
5c46a5e680 ui/treemacs: restore old h/l behavior
Fixes #5056
2021-05-15 14:09:08 -04:00
Eric Dallo
53bd779cc9
ui/treemacs: add +lsp flag 2021-04-14 18:21:04 -03:00
Henrik Lissner
f6de662011 Keep treemacs-mode in aw-ignored-buffers
This was an arbitrary default. It's easier to remove than to add
back (see #4746). I'd rather be faithful to treemacs' author's vision.

Closes #4746

Co-authored-by: daanturo <daanturo@users.noreply.github.com>
2021-03-07 12:46:14 -05:00
Henrik Lissner
3ce18233e1
Fix untargetable treemacs window from ace-window 2020-08-13 12:49:21 -04:00
Henrik Lissner
577e8b8102
Excluse treemacs buffer from ace-window
This allows users to jump to treemacs with ace-window, but when opening
files from treemacs with treemacs-visit-node-ace-* commands (e.g. on
oaa) it doesn't make sense to open files in the treemacs window.
2020-08-12 20:58:41 -04:00
James Ravn
b5a2cde062
Simplify :after, and add whitespace 2020-04-03 09:30:10 +01:00
James Ravn
e05e452528
Enable treemacs workspace/persp support
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.
2020-04-02 21:05:49 +01:00
Henrik Lissner
13aa3e8407
Fix #2613: remove treemacs-persp
A common bug report is that straight cannot see treemacs-persp in MELPA.
Perhaps the MELPA repo isn't being updated properly -- I have no idea,
but since this package isn't doing anything at the moment, I will simply
remove the package until I have time to look into it further.
2020-02-27 00:49:47 -05:00
Henrik Lissner
4c0751ca75
ui/treemacs: refactor & activate treemacs-git-mode 2020-02-25 22:35:58 -05:00
Henrik Lissner
5a07e8f655
Add treemacs-persp package #1348 2020-01-13 16:03:22 -05:00
Henrik Lissner
4fe24df90f
Fix #1970: don't count treemacs as a "popup"
And remove its popup rule.

It isn't being caught by the popup system in the first place, so this is
all a charade.
2020-01-06 03:50:48 -05:00
Henrik Lissner
acdd16f2b1
ui/treemacs: treemacs-sorting = 'alphabetic-case-insensitive-asc
Since sorting was reversed upstream:

Alexander-Miller/treemacs@af757e6
2019-12-13 16:22:14 -05:00
Henrik Lissner
e0469e14c0
Minor refactors & reformatting across the board 2019-10-20 19:57:27 -04:00
Henrik Lissner
44eb11c028
ui/treemacs: make o {v,s} consistent w/ C-w {v,s} #1875 2019-10-10 16:58:23 -04:00
Henrik Lissner
06a8384f77
ui/treemacs: remove unnecessary hack
Due to changes upstream.
2019-09-20 23:54:53 -04:00
Henrik Lissner
76cacb5bfe
💥 Rename def-package! -> use-package!
Calling this pivotal macro "def-package!" has frequently been a source
of confusion. It is a thin wrapper around use-package, and it should be
obvious that it is so. For this reason, and to match the naming
convention used with other convenience macros/wrappers, it is now
use-package!.

Also changes def-package-hook! -> use-package-hook!

The old macros are now marked obsolete and will be removed when straight
integration is merged.
2019-07-23 12:50:45 +02:00
Henrik Lissner
9d1e2c5bd9
Fix delq! use causing wrong-type-arg error w/ treemacs 2019-07-22 16:41:43 +02:00
Henrik Lissner
1c4215c187
Fix 'command not found' errors for hidden commands 2019-07-22 04:46:14 +02:00
Henrik Lissner
dbcd2f7624
Move treemacs-last-error-persist-file out of ~/.emacs.d
Git off my lawn.
2019-07-11 17:22:27 +02:00
Jeff Jewiss
4e24d09f71
use treemacs-magit package
Install and use treemacs-magit if both treemacs and magit are enabled in init.el.
2019-05-10 11:38:34 -04:00
Henrik Lissner
77e4cc4d58
💥 Remove :feature category
:feature was a "catch-all" category. Many of its modules fit better in
other categories, so they've been moved:

- feature/debugger -> tools/debugger
- feature/evil -> editor/evil
- feature/eval -> tools/eval
- feature/lookup -> tools/lookup
- feature/snippets -> editor/snippets
- feature/file-templates -> editor/file-templates
- feature/workspaces -> ui/workspaces

More potential changes in the future:

- A new :term category for terminal emulation modules (eshell, term and
  vterm).
- A new :os category for modules dedicated to os-specific functionality.
  The :tools macos module would fit here, but so would modules for nixos
  and arch.
- A new :services category for web-service integration, like wakatime,
  twitter, elfeed, gist and pastebin services.
2019-04-24 18:16:04 -04:00
Henrik Lissner
a37e1922da
ui/treemacs: fix tab/ret keybinds in evil treemacs
Fixes #1257
2019-03-15 01:49:11 -04:00
Henrik Lissner
115d1990d4
ui/treemacs: remove hl-line->region face remapping
This causes more issues that solves. Perhaps something can be done
upstream to make this line highlight brighter.

Possibly addresses #957
2019-03-04 04:57:07 -05:00
Henrik Lissner
0534d85c54
ui/treemacs: refactor
Treemacs enables treemacs-filewatch-mode and treemacs-git-mode itself.
Also removes settings that are the same as the defaults.
2019-03-04 04:57:07 -05:00
Henrik Lissner
d6d67ac568
Force ace-window not to ignore treemacs #1177 2019-02-18 20:17:19 -05:00
Henrik Lissner
3fd1548da5
Set treemacs--last-error-persist-file later #1151
Because treemacs--last-error-persist-file is defined with defconst, its
default value will overwrite our custom one once the
treemacs-persistence package is loaded.
2019-02-03 18:54:13 -05:00
Ting Zhou
e00ea2c306 ui/treemacs: assgin treemacs--last-error-persist-file 2019-01-23 14:18:31 -08:00
Henrik Lissner
fbb0297eb1
ui/treemacs: remove leader key fix
These aren't necessary now that the leader keymap has high precedence.
2019-01-08 20:40:26 -05:00
Henrik Lissner
d5f8ecdfce
ui/treemacs: fix leader key in treemacs
This is an ugly hack and I should be ashamed.

Shame.

Shame.

Shame.

But alas, it shall do until general.el is in.

Fixes #860
2018-09-27 18:16:21 -04:00
Henrik Lissner
e866fc46aa
ui/treemacs: make hl-line stand out more #846
By remapping it to the region face. Perhaps another face would be a
better fit?
2018-08-28 13:30:51 +02:00
Henrik Lissner
4ab1bbbdba
Fix 'simple mode for +treemacs-use-git-mode
Due to pattern mismatch, 'simple mode was never activated.
2018-08-06 22:41:43 +02:00
Henrik Lissner
4db89a2fb4
Remove treemacs popup hack
Now that it is supported upstream.

Relevant to #766
2018-08-03 19:15:46 +02:00
Henrik Lissner
8756837036
ui/treemacs: disable treemacs-follow-mode
Can be disruptive if you've got many windows with buffers across
different projects. Also, SPC o P is available to "jump to current file"
in the treemacs window.
2018-07-19 03:38:52 +02:00
Henrik Lissner
e4778f9923
Disable treemacs-follow-mode by default
This has proven intrusive, especially when you have files from different
projects open and you switch between them rapidly. Enabling
treemacs-follow-mode is left up to the user. Otherwise, the SPC o P
keybind and treemacs-find-file command can this manually and on-demand.

Also remove hide-mode-line-mode from treemacs because it's redundant
with the doom-themes treemacs icon theme.
2018-07-10 23:08:05 +02:00
Henrik Lissner
35b76ee49b
Enable minimalistic icon theme for treemacs
Still experimental.
2018-07-10 23:05:01 +02:00
Henrik Lissner
b2b6ff67f2
Prevent treemacs from creating ~/.emacs.d/.cache
Alexander-Miller/treemacs#212 introduced treemacs-persist-file, which we
now use instead of tools/treemacs' old treemacs-persistence hack (which
didn't work).

Relevant to #669
2018-06-14 14:03:10 +02:00
Henrik Lissner
c8783f3291
ESC -> close treemacs for evil users 2018-06-11 00:11:20 +02:00
Henrik Lissner
8c6e403215
Hide mode-line in treemacs 2018-06-11 00:11:04 +02:00