From 3bd28440f76f429f6a782db598137f265902bf50 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Mon, 12 Dec 2022 09:39:46 +0530 Subject: [PATCH] Disable tree sitter https://github.com/emacs-tree-sitter/elisp-tree-sitter/issues/247 --- .emacs.d/init.el | 19 +++---------------- machines/home-manager/packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index f6302d8..8817e4b 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -102,21 +102,8 @@ (setq ac-ignore-case nil) (ac-config-default))) -(use-package tree-sitter - :config - (progn - (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))) - -(use-package tree-sitter-langs - :config - (progn - (add-to-list 'tree-sitter-major-mode-language-alist '(markdown-mode . markdown)))) - (use-package markdown-mode - ;; :ensure t - :quelpa (markdown-mode :fetcher file - :path "~/github/markdown-mode" - :files ("*.el")) + :ensure t :bind (:map markdown-mode-map ;; ("C-c p" . markdown-previous-visible-heading) ("C-c n" . markdown-next-visible-heading)) @@ -147,7 +134,7 @@ (lsp-configure . lsp-lens-mode) (terraform-mode . lsp-deferred)) :custom - (lsp-disabled-clients '(tfls clangd)) + (lsp-disabled-clients '(tfls clangd rls)) ;; (lsp-log-io t) (lsp-log-io nil) (lsp-semantic-tokens-enable t) @@ -207,7 +194,7 @@ :bind (:map rustic-mode-map ("M-j" . lsp-ui-imenu) ("M-?" . lsp-find-references) - ("C-c C-d" . deadgrep) + ("C-c C-c C-i" . rustic-cargo-install) ("C-c C-c l" . flycheck-list-errors) ("C-c C-c a" . lsp-execute-code-action) ("C-c C-c r" . lsp-rename) diff --git a/machines/home-manager/packages.nix b/machines/home-manager/packages.nix index 2a93135..2af9ba7 100644 --- a/machines/home-manager/packages.nix +++ b/machines/home-manager/packages.nix @@ -135,7 +135,10 @@ with pkgs; [ # Unfree google-chrome - unstable.vscode + vscode + + # Unstable + unstable.rust-analyzer # From Overlays em