diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a37e165f2..09ed4dac5 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -112,7 +112,7 @@
 | nasm | ✓ | ✓ |  |  |
 | nickel | ✓ |  | ✓ | `nls` |
 | nim | ✓ | ✓ | ✓ | `nimlangserver` |
-| nix | ✓ |  |  | `nil` |
+| nix | ✓ | ✓ |  | `nil` |
 | nu | ✓ |  |  | `nu` |
 | nunjucks | ✓ |  |  |  |
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
diff --git a/runtime/queries/nix/textobjects.scm b/runtime/queries/nix/textobjects.scm
new file mode 100644
index 000000000..1508d4c2b
--- /dev/null
+++ b/runtime/queries/nix/textobjects.scm
@@ -0,0 +1,9 @@
+(comment) @comment.inside
+(comment)+ @comment.around
+
+(formals
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(function_expression
+  body: (_) @function.inside) @function.around
+