diff --git a/nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el b/nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el
index 88db12f..1774f1a 100644
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el
@@ -12,10 +12,9 @@
   "Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters."
   (let (
         (stdout-buffer (generate-new-buffer "tmp-stdout" t))
-        (full-cmd (append '(call-process-region nil nil cmd nil stdout-buffer nil) args))
         )
     (unwind-protect
-        (let ((exit-status (eval full-cmd)))
+        (let ((exit-status (apply #'call-process-region nil nil cmd nil (list stdout-buffer nil) nil args)))
           (if (eq exit-status 0)
               (save-excursion
                 (replace-buffer-contents stdout-buffer)
@@ -32,10 +31,9 @@
   "Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters. This version only replaces the buffer contents if the command output some text."
   (let (
         (stdout-buffer (generate-new-buffer "tmp-stdout" t))
-        (full-cmd (append '(call-process-region nil nil cmd nil stdout-buffer nil) args))
         )
     (unwind-protect
-        (let ((exit-status (eval full-cmd)))
+        (let ((exit-status (apply #'call-process-region nil nil cmd nil (list stdout-buffer nil) nil args)))
           (if (eq exit-status 0)
               (if (> (buffer-size stdout-buffer) 0)
                   (save-excursion
@@ -56,10 +54,9 @@
   (let (
         (default-directory (or dir default-directory))
         (stdout-buffer (generate-new-buffer "tmp-stdout" t))
-        (full-cmd (append '(call-process cmd nil (list stdout-buffer nil) nil) args))
         )
     (unwind-protect
-        (let ((exit-status (condition-case nil (eval full-cmd) (file-missing nil))))
+        (let ((exit-status (condition-case nil (apply #'call-process cmd nil (list stdout-buffer nil) nil args) (file-missing nil))))
           (if (eq exit-status 0)
               (progn
                 (with-current-buffer stdout-buffer
diff --git a/nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el b/nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el
index ac057e2..dc453ae 100644
--- a/nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el
@@ -15,6 +15,8 @@
   ;;   :custom
   ;;   (treesit-font-lock-level 3)
   (setq treesit-font-lock-level 4)
+  ;; (setq treesit-auto-install-grammar t)
+  ;; (setq treesit-enabled-modes t)
   )
 
 (provide 'util-tree-sitter)