From c5cc2a36e1ea039d34ae1747e5516a742e5194e8 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 27 May 2023 12:09:15 -0400 Subject: [PATCH] Move the definition of treesitter grammars to the init block. --- ansible/roles/emacs/files/init.el | 2 +- ansible/roles/emacs/files/lang-rust.el | 2 +- ansible/roles/emacs/files/lang-yaml.el | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ansible/roles/emacs/files/init.el b/ansible/roles/emacs/files/init.el index 978a3d6..4c559f5 100644 --- a/ansible/roles/emacs/files/init.el +++ b/ansible/roles/emacs/files/init.el @@ -14,7 +14,7 @@ (require 'lang-rust) -;; (require 'lang-yaml) +(require 'lang-yaml) ;; (require 'lang-org) diff --git a/ansible/roles/emacs/files/lang-rust.el b/ansible/roles/emacs/files/lang-rust.el index 2a61813..fb60a0c 100644 --- a/ansible/roles/emacs/files/lang-rust.el +++ b/ansible/roles/emacs/files/lang-rust.el @@ -43,9 +43,9 @@ ) :init (add-to-list 'major-mode-remap-alist '(rust-mode . rust-ts-mode)) - :config (add-to-list 'treesit-language-source-alist '(rust "https://github.com/tree-sitter/tree-sitter-rust")) (treesit-install-language-grammar 'rust) + :config ;; Add keybindings for interacting with Cargo (use-package cargo :hook (rust-ts-mode . cargo-minor-mode)) diff --git a/ansible/roles/emacs/files/lang-yaml.el b/ansible/roles/emacs/files/lang-yaml.el index 7eef88a..75ce1d5 100644 --- a/ansible/roles/emacs/files/lang-yaml.el +++ b/ansible/roles/emacs/files/lang-yaml.el @@ -15,12 +15,12 @@ (use-package yaml-mode :mode - (("playbook\\.tmp\\'" . yaml-mode) - ("environments/[^/]*/group_vars/[^/]*\\'" . yaml-mode) - ("environments/[^/]*/host_vars/[^/]*\\'" . yaml-mode) + (("playbook\\.tmp\\'" . yaml-ts-mode) + ("environments/[^/]*/group_vars/[^/]*\\'" . yaml-ts-mode) + ("environments/[^/]*/host_vars/[^/]*\\'" . yaml-ts-mode) ) :hook ( - (yaml-mode . (lambda () + (yaml-ts-mode . (lambda () (setq eglot-workspace-configuration (list (cons ':yaml (list ':hover :json-false :validate :json-false :completion t)))) (eglot-ensure) @@ -28,8 +28,12 @@ )) ) ;; :bind ( - ;; (:map yaml-mode-map ([backspace] . yaml-backspace)) + ;; (:map yaml-ts-mode-map ([backspace] . yaml-backspace)) ;; ) + :init + (add-to-list 'major-mode-remap-alist '(yaml-mode . yaml-ts-mode)) + (add-to-list 'treesit-language-source-alist '(yaml "https://github.com/ikatyang/tree-sitter-yaml")) + (treesit-install-language-grammar 'yaml) ) (provide 'lang-yaml)