Moving to Emacs 30 and removing ts refs

Now that tree sitter is built in, might as well embrace it.

ha-programming-ansible.org

@@ -64,7 +64,6 @@ The [[https://github.com/antonj/Highlight-Indentation-for-Emacs][Highlight-Inden
   (use-package highlight-indentation
     :straight (:host github :repo "antonj/Highlight-Indentation-for-Emacs")
     :hook ((yaml-mode . highlight-indentation-mode)
-           (yaml-ts-mode . highlight-indentation-mode)
            (python-mode . highlight-indentation-mode)))
 #+end_src
 
@@ -102,41 +101,39 @@ Doing a lot of [[https://github.com/yoshiki/yaml-mode][YAML work]], but  the =ya
 , so I’ve switch to [[https://github.com/zkry/yaml-pro][yaml-pro]] that is now based on Tree Sitter. Let’s make sure the Tree-Sitter version works:
 
 #+begin_src emacs-lisp
-  (when (treesit-available-p)
+  (use-package yaml-mode
-    (use-package yaml-ts-mode
+    :after mixed-pitch
-      :straight (:type built-in)
+    :mode ((rx ".yamllint")
-      :after mixed-pitch
+           (rx ".y" (optional "a") "ml" string-end))
-      :mode ((rx ".yamllint")
+    :hook (yaml-mode . (lambda () (mixed-pitch-mode -1)))
-             (rx ".y" (optional "a") "ml" string-end))
+    :mode-hydra
-      :hook (yaml-ts-mode . (lambda () (mixed-pitch-mode -1)))
+    ((:foreign-keys run)
-      :mode-hydra
+     ("Simple"
-      ((:foreign-keys run)
+      (("l" ha-yaml-next-section "Next section")
-       ("Simple"
+       ("h" ha-yaml-prev-section "Previous")))))
-        (("l" ha-yaml-next-section "Next section")
-         ("h" ha-yaml-prev-section "Previous"))))))
 #+end_src
 
 Allow this mode in Org blocks:
 #+begin_src emacs-lisp :results silent
-  (add-to-list 'org-babel-load-languages '(yaml-ts . t))
+  (add-to-list 'org-babel-load-languages '(yaml . t))
 #+end_src
 
 And we hook
 #+begin_src emacs-lisp
   (use-package yaml-pro
     :straight (:host github :repo "zkry/yaml-pro")
-    :after yaml-ts-mode
+    :after yaml-mode
-    :hook ((yaml-ts-mode . yaml-pro-ts-mode)
+    :hook ((yaml-mode . yaml-pro-mode)))
-           (yaml-mode . yaml-pro-mode)))
 #+end_src
 
 Since I can never remember too many keybindings for particular nodes, we create a Hydra just for it.
 
 #+begin_src emacs-lisp
+  (defvar ha-yaml--title (font-icons 'devicon "yaml" :title "YAML Mode"))
   (use-package major-mode-hydra
     :after yaml-pro
     :config
-    (major-mode-hydra-define yaml-ts-mode (:foreign-keys run)
+    (major-mode-hydra-define yaml-mode (:title ha-yaml--title :foreign-keys run)
       ("Navigation"
        (("u" yaml-pro-ts-up-level "Up level" :color pink) ; C-c C-u
         ("J" yaml-pro-ts-next-subtree "Next subtree" :color pink) ; C-c C-n
@@ -171,10 +168,12 @@ Jinja is a /template/ system that integrates /inside/ formats like JSON, HTML or
 The [[https://polymode.github.io/][polymode]] project /glues/ modes like [[https://github.com/paradoxxxzero/jinja2-mode][jinja2-mode]] to [[https://github.com/yoshiki/yaml-mode][yaml-mode]].
 
 I adapted this code from the [[https://github.com/emacsmirror/poly-ansible][poly-ansible]] project:
-#+begin_src emacs-lisp
+
+#+begin_src emacs-lisp :tangle no
   (use-package polymode
+    :after yaml-mode jinja2-mode
     :config
-    (define-hostmode poly-yaml-hostmode :mode 'yaml-ts-mode)
+    (define-hostmode poly-yaml-hostmode :mode 'yaml-mode)
 
     (defcustom pm-inner/jinja2
       (pm-inner-chunkmode :mode #'jinja2-mode
@@ -195,23 +194,23 @@ I adapted this code from the [[https://github.com/emacsmirror/poly-ansible][poly
       :hostmode 'poly-yaml-hostmode
       :innermodes '(pm-inner/jinja2))
 
-    (major-mode-hydra-define+ yaml-ts-mode nil
+    (major-mode-hydra-define+ yaml-mode nil
       ("Extensions" (("j" poly-yaml-jinja2-mode "Jinja2")))))
 #+end_src
 
 We need to make sure the =mixed-pitch-mode= doesn’t screw things up.
 
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
   (add-hook 'poly-yaml-jinja2-mode-hook (lambda () (mixed-pitch-mode -1)))
 #+end_src
 
 We /can/ hook this up to Org, via:
 
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
   (add-to-list 'org-babel-load-languages '(poly-yaml-jinja2 . t))
 #+end_src
 
-Now we can use either =yaml-ts= or =poly-yaml-jinja2= (which perhaps we should make an alias?):
+Now we can use either =yaml= or =poly-yaml-jinja2= (which perhaps we should make an alias?):
 
 #+begin_src poly-yaml-jinja2 :tangle no
   ---
@@ -230,15 +229,16 @@ Now we can use either =yaml-ts= or =poly-yaml-jinja2= (which perhaps we should m
 #+end_src
 * Ansible
 Do I consider all YAML files an Ansible file needing [[https://github.com/k1LoW/emacs-ansible][ansible-mode]]? Maybe we just have a toggle for when we want the Ansible feature.
+
 #+begin_src emacs-lisp
   (use-package ansible
-    :straight (:host github :repo "k1LoW/emacs-ansible")
+    :straight (:host gitlab :repo "emacs-ansible/emacs-ansible")
     ;; :mode ((rx (or "playbooks" "roles") (one-or-more any) ".y" (optional "a") "ml") . ansible-mode)
     :config
     (setq ansible-vault-password-file "~/.ansible-vault-passfile")
-    (major-mode-hydra-define+ yaml-ts-mode nil
+    (major-mode-hydra-define+ yaml-mode nil
-       ("Extensions" (("a" ansible "Ansible"))))
+       ("Extensions" (("a" ansible-mode "Ansible"))))
-    (ha-leader "t y" 'ansible))
+    (ha-leader "t y" 'ansible-mode))
 #+end_src
 
 The [[help:ansible-vault-password-file][ansible-vault-password-file]] variable needs to change /per project/, so let’s use the =.dir-locals.el= file, for instance:
@@ -246,15 +246,23 @@ The [[help:ansible-vault-password-file][ansible-vault-password-file]] variable n
   ((nil . ((ansible-vault-password-file . "playbooks/.vault-password"))))
 #+end_src
 
+Since most Ansible files are a combination of YAML and Jinja, the [[https://github.com/emacsmirror/poly-ansible][poly-ansible]] project addresses this similar to =web-mode=:
+
+#+BEGIN_SRC emacs-lisp
+  (use-package poly-ansible
+    :straight (:host github :repo "emacsmirror/poly-ansible")
+    :after ansible)
+#+END_SRC
+
 The YAML files get access Ansible’s documentation using the [[https://github.com/emacsorphanage/ansible-doc][ansible-doc]] project (that accesses the [[https://docs.ansible.com/ansible/latest/cli/ansible-doc.html][ansible-doc interface]]):
 
 #+begin_src emacs-lisp
   (use-package ansible-doc
-    :after yaml-ts-mode
+    :after yaml-mode
-    :hook (yaml-ts-mode . ansible-doc-mode)
+    :hook (yaml-mode . ansible-doc-mode)
     :config
     ;; (add-to-list 'exec-path (expand-file-name "~/.local/share/mise/installs/python/3.10/bin/ansible-doc"))
-    (major-mode-hydra-define+ yaml-ts-mode nil
+    (major-mode-hydra-define+ yaml-mode nil
        ("Documentation"
         (("D" ansible-doc "Ansible")))))
 #+end_src

ha-programming.org

@@ -322,6 +322,7 @@ Install the binary for the [[https://tree-sitter.github.io/][tree-sitter project
 #+begin_src sh
   brew install tree-sitter npm # Since most support packages need that too.
 #+end_src
+
 The tree-sitter project does not install any language grammars by default—after all, it would have no idea which particular languages to parse and analyze!
 
 Next, using the =tree-sitter= command line tool, create the [[/Users/howard.abrams/Library/Application Support/tree-sitter/config.json][config.json]] file:
@@ -342,14 +343,17 @@ Normally, you would need to  add all the projects to directory clones in =~/src=
     git pull origin
     npm install
   done <<EOL
-  https://github.com/tree-sitter/tree-sitter-css
+  https://github.com/tree-sitter/tree-sitter-go
+  https://github.com/tree-sitter/tree-sitter-javascript
+  https://github.com/tree-sitter/tree-sitter-templ
+  https://github.com/ikatyang/tree-sitter-yaml
   https://github.com/tree-sitter/tree-sitter-json
+  https://github.com/tree-sitter/tree-sitter-css
   https://github.com/tree-sitter/tree-sitter-python
   https://github.com/tree-sitter/tree-sitter-bash
   https://github.com/tree-sitter/tree-sitter-ruby
   https://github.com/camdencheek/tree-sitter-dockerfile
   https://github.com/alemuller/tree-sitter-make
-  https://github.com/ikatyang/tree-sitter-yaml
   https://github.com/Wilfred/tree-sitter-elisp
   EOL
 #+end_src
@@ -378,15 +382,18 @@ In most cases,the =npm install= /usually/ works, but I may work on some sort of
     NAME=$(pwd | sed 's/.*-//')
 
     git pull origin
-    npm install || cargo build || make install   # Various build processes!?
+    npm install || make install   # Various build processes!?
 
     echo "Do we need to copy the library into ~/.emacs.d/tree-sitter/$NAME ?"
-    # if [ "$(uname -o)" = "Darwin" ]
+    if [[ -e libtree-sitter-$NAME.dylib ]]
-    # then
+    then
-    #   cp libtree-sitter-$NAME.dylib ~/.emacs.d/tree-sitter
+      cp libtree-sitter-$NAME.dylib ~/.emacs.d/tree-sitter
-    # else
+    fi
-    #   cp libtree-sitter-$NAME.so ~/.emacs.d/tree-sitter
+
-    # fi
+    if [[ -e libtree-sitter-$NAME.so ]]
+    then
+      cp libtree-sitter-$NAME.so ~/.emacs.d/tree-sitter
+    fi
   done
 #+end_src
 At this point, we can now parse stuff using: =tree-sitter parse <source-code-file>=
@@ -412,6 +419,7 @@ However, Emacs already has the ability to download and install grammars, so foll
               ;; (elixir     "https://github.com/elixir-lang/tree-sitter-elixir" "main" "src")
               ;; (erlang     "https://github.com/WhatsApp/tree-sitter-erlang" "main" "src")
               (go         "https://github.com/tree-sitter/tree-sitter-go")
+              (templ      "https://github.com/vrischmann/tree-sitter-templ")
               ;; (haskell    "https://github.com/tree-sitter/tree-sitter-haskell" "master" "src")
               (html       "https://github.com/tree-sitter/tree-sitter-html")
               ;; (java       "https://github.com/tree-sitter/tree-sitter-java" "master" "src")