[emacs] shrug

.emacs.d/custom.el

@@ -12,7 +12,8 @@
  '(c-label-minimum-indentation 0)
  '(c-label-offset -4)
  '(clojure-build-tool-files
-   '("project.clj" "build.boot" "build.gradle" "build.gradle.kts" "deps.edn" "shadow-cljs.edn" "TARGETS"))
+   '("project.clj" "build.boot" "build.gradle" "build.gradle.kts" "deps.edn"
+     "shadow-cljs.edn" "TARGETS"))
  '(comint-input-ignoredups t)
  '(comint-prompt-read-only t)
  '(comint-scroll-to-bottom-on-input t)
@@ -58,23 +59,38 @@
  '(org-odd-levels-only t)
  '(org-todo-keywords '((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED")))
  '(package-selected-packages
-   '(doom-themes adaptive-wrap add-node-modules-path ag auto-complete auto-complete-nxml bazel blacken cider clang-format clojure-mode color-theme-monokai color-theme-sanityinc-solarized color-theme-sanityinc-tomorrow company company-jedi company-lsp compat cquery dash-functional deadgrep dockerfile-mode earthfile-mode eglot eglot-java elm-mode esup exec-path-from-shell filladapt flycheck flycheck-elm flycheck-rust flymake flyspell fsharp-mode geiser gnu-elpa-keyring-update go-autocomplete go-mode graphviz-dot-mode hack-mode haxe-mode howm ink-mode js2-mode js2-refactor json-mode lsp-hack lsp-pyright lsp-ui lua-mode magit markdown-mode merlin mocha modus-themes monky monokai-theme multi-term mustache-mode nyan-mode paredit popup prettier-js projectile protobuf-mode python-mode rjsx-mode ruby-mode rust-mode sql-indent swift-mode switch-window terraform-mode thrift tide tree-sitter tss tuareg typescript-mode use-package vterm web-mode wgrep xref-js2 xterm-color yaml-mode zig-mode))
+   '(adaptive-wrap add-node-modules-path ag auto-complete auto-complete-nxml
+                   bazel blacken cider clang-format clojure-mode
+                   color-theme-monokai color-theme-sanityinc-solarized
+                   color-theme-sanityinc-tomorrow company company-jedi
+                   company-lsp compat cquery dash-functional deadgrep
+                   dockerfile-mode doom-themes earthfile-mode eglot
+                   eglot-java elm-mode esup exec-path-from-shell filladapt
+                   flycheck flycheck-elm flycheck-rust flymake flyspell
+                   fsharp-mode geiser gnu-elpa-keyring-update go-autocomplete
+                   go-mode graphviz-dot-mode hack-mode haxe-mode howm
+                   ink-mode js2-mode js2-refactor json-mode lsp-hack
+                   lsp-pyright lsp-ui lua-mode magit markdown-mode merlin
+                   mocha modus-themes monky monokai-theme multi-term
+                   mustache-mode nyan-mode paredit popup prettier-js
+                   projectile protobuf-mode python-mode rjsx-mode ruby-mode
+                   rust-mode sql-indent swift-mode switch-window
+                   terraform-mode thrift tide tree-sitter tss tuareg
+                   typescript-mode use-package vterm web-mode wgrep xref-js2
+                   xterm-color yaml-mode zig-mode))
  '(reb-re-syntax 'string)
  '(rmail-mail-new-frame t)
  '(safe-local-variable-values
    '((docker-image-name . "onceandfuture")
-     (eval ignore-errors "Write-contents-functions is a buffer-local alternative to before-save-hook"
+     (eval ignore-errors
+           "Write-contents-functions is a buffer-local alternative to before-save-hook"
            (add-hook 'write-contents-functions
-                     (lambda nil
-                       (delete-trailing-whitespace)
-                       nil))
+                     (lambda nil (delete-trailing-whitespace) nil))
            (require 'whitespace)
            "Sometimes the mode needs to be toggled off and on."
-           (whitespace-mode 0)
-           (whitespace-mode 1))
+           (whitespace-mode 0) (whitespace-mode 1))
      (whitespace-line-column . 80)
-     (whitespace-style face trailing lines-tail)
-     (require-final-newline . t)))
+     (whitespace-style face trailing lines-tail) (require-final-newline . t)))
  '(scroll-conservatively 1)
  '(scroll-step 1)
  '(sd-user-email "johndoty@microsoft.com")

.emacs.d/init.el

@@ -301,7 +301,7 @@
         (emacs-lisp-docstring-fill-column t))
     (fill-paragraph nil region)))
 
-(defun my--fix-aspell ()
+(defun my/fix-aspell ()
   "Fix aspell location when it's not there, by looking in hard-coded locations."
   (require 'ispell)
   (if (and (not (executable-find ispell-program-name))
@@ -310,8 +310,8 @@
         (message "Redirecting aspell to known location")
         (setq ispell-program-name "c:/msys64/usr/bin/aspell.exe"))))
 
-(add-hook 'ispell-minor-mode-hook 'my--fix-aspell)
-(add-hook 'flyspell-mode-hook 'my--fix-aspell)
+(add-hook 'ispell-minor-mode-hook 'my/fix-aspell)
+(add-hook 'flyspell-mode-hook 'my/fix-aspell)
 
 
 ;; =================================================================
@@ -322,7 +322,8 @@
 ;; 2023-08-26 Wow, like what am I even doing? This goes at the top of the
 ;; various things because we're going to be playing with modes and whatnot.
 
-(when (functionp 'tree-sitter-mode)
+(when (and (functionp 'treesit-available-p)
+           (treesit-available-p))
   (setq treesit-language-source-alist
         '((bash "https://github.com/tree-sitter/tree-sitter-bash")
           (cmake "https://github.com/uyha/tree-sitter-cmake")
@@ -340,7 +341,9 @@
           (toml "https://github.com/tree-sitter/tree-sitter-toml")
           (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src")
           (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src")
-          (yaml "https://github.com/ikatyang/tree-sitter-yaml")))
+          (yaml "https://github.com/ikatyang/tree-sitter-yaml")
+          (fine "~/src/lrparsers/tree-sitter-fine")
+          ))
 
   (add-to-list 'major-mode-remap-alist '(rust-mode . rust-ts-mode))
   )