From 4f78ee33bfc828707a79cd79d296bf4a9c25b5b9 Mon Sep 17 00:00:00 2001 From: benj Date: Sat, 11 Nov 2023 09:03:04 -0800 Subject: add treesitter and remove some breaking haskell formatters --- .gitignore | 3 ++- init.el | 6 +----- settings/setup-treesitter.el | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 settings/setup-treesitter.el diff --git a/.gitignore b/.gitignore index 928b523..c8c8f34 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ transient/ pcache eln-cache/ projects -bookmarks \ No newline at end of file +bookmarks +tree-sitter \ No newline at end of file diff --git a/init.el b/init.el index 95db4c0..9725b68 100644 --- a/init.el +++ b/init.el @@ -51,7 +51,6 @@ '(ace-window blacken cargo - cider company company-c-headers company-glsl @@ -78,8 +77,6 @@ flycheck-haskell flycheck-pos-tip go-mode - haskell-mode - hasklig-mode highlight-escape-sequences hl-todo ido-vertical-mode @@ -114,7 +111,6 @@ smart-mode-line solarized-theme swift-mode - swift-playground-mode systemd terraform-mode treemacs @@ -165,7 +161,6 @@ (require 'setup-dockerfile-mode) (require 'setup-flycheck) (require 'setup-go-mode) -(require 'setup-haskell-mode) (require 'setup-ido) (require 'setup-keychain-environment) (require 'setup-lisp-mode) @@ -183,6 +178,7 @@ (require 'setup-slime-mode) (require 'setup-terraform-mode) (require 'setup-treemacs) +(require 'setup-treesitter) (require 'setup-typescript-mode) (require 'setup-txt-mode) (require 'setup-web-mode) diff --git a/settings/setup-treesitter.el b/settings/setup-treesitter.el new file mode 100644 index 0000000..3c97e26 --- /dev/null +++ b/settings/setup-treesitter.el @@ -0,0 +1,15 @@ +(setq treesit-language-source-alist + '((astro "https://github.com/virchau13/tree-sitter-astro") + (bash "https://github.com/tree-sitter/tree-sitter-bash") + (c "https://github.com/tree-sitter/tree-sitter-c") + (css "https://github.com/tree-sitter/tree-sitter-css") + (html "https://github.com/tree-sitter/tree-sitter-html") + (json "https://github.com/tree-sitter/tree-sitter-json") + (make "https://github.com/alemuller/tree-sitter-make") + (python "https://github.com/tree-sitter/tree-sitter-python") + (rust "https://github.com/tree-sitter/tree-sitter-rust") + (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") + (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src"))) + +(provide 'setup-treesitter) +;;; setup-treesitter.el ends here -- cgit v1.2.3