diff --git a/home.nix b/home.nix
index 9caa2f4..d9b088b 100644
--- a/home.nix
+++ b/home.nix
@@ -659,13 +659,6 @@ in
 
       treesitter = {
         enable = true;
-        settings = {
-          highlight.enable = true;
-          indent.enable = true;
-        };
-        grammarPackages = with pkgs.tree-sitter-grammars; [
-          tree-sitter-uiua
-        ];
       };
 
       undotree.enable = true;
@@ -970,6 +963,13 @@ in
         },
       })
 
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = "uiua",
+        callback = function()
+          vim.bo.commentstring = "# %s"
+        end,
+      })
+
       -- LSP Semantic Token highlighting for Uiua with Dracula colors
       vim.api.nvim_set_hl(0, "@lsp.type.monadic_function.uiua", { fg = "#50fa7b" })      -- Green
       vim.api.nvim_set_hl(0, "@lsp.type.dyadic_function.uiua", { fg = "#8be9fd" })       -- Cyan