diff options
| author | Alan Pearce | 2023-08-29 07:15:29 +0200 |
|---|---|---|
| committer | Alan Pearce | 2023-08-29 07:15:29 +0200 |
| commit | 00396bca6f8b1b658a92f141d710d1cb7f1d24fc (patch) | |
| tree | 07b2bce0c4facbd84a2a0144e7cf3684aaeac1e0 /user | |
| parent | eac68ad549a2b60e23aa8d6e4edf75993c95733b (diff) | |
| download | nixfiles-00396bca6f8b1b658a92f141d710d1cb7f1d24fc.tar.lz nixfiles-00396bca6f8b1b658a92f141d710d1cb7f1d24fc.tar.zst nixfiles-00396bca6f8b1b658a92f141d710d1cb7f1d24fc.zip | |
Emacs: use built-in (>=29) tree-sitter package
Diffstat (limited to 'user')
| -rw-r--r-- | user/emacs/init.el | 22 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 4 |
2 files changed, 1 insertions, 25 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index ff423f94..4211898d 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -1027,28 +1027,6 @@ _p_rev _u_pper _=_: upper/lower _r_esolve :config (progn (setq treemacs-no-png-images t))) -(use-package tree-sitter - :defer 30 - :init (defvar tree-sitter-langs--testing t) ; do not install grammars (nix does that) - :ghook ('(sh-mode-hook - c-mode-common-hook - css-mode-hook - go-mode-hook - html-mode-hook - nix-mode-hook - js-mode-hook - js2-mode-hook - json-mode-hook - typescript-mode-hook - python-mode-hook - rustic-mode-hook))) -(use-package tree-sitter-langs - :defer 30 - :after tree-sitter) - -(use-package tree-sitter-indent - :ghook ('(rustic-mode-hook))) - (use-package eglot :defer 30 :general (:states 'normal :keymaps 'eglot-mode-map diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index e13ef6c1..3905980d 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -173,9 +173,7 @@ in rainbow-delimiters stimmung-themes toml-mode - tree-sitter - tree-sitter-langs - tree-sitter-indent + treesit-grammars.with-all-grammars use-package vertico vertico-prescient |