diff --git a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix
index 82a12492..85331a13 100644
--- a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix
+++ b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix
@@ -11,14 +11,14 @@
     cssls.enable = true; # For CSS.
     denols.enable = true; # For Deno runtime.
     dockerls.enable = true; # For Dockerfiles.
-    emmet_ls.enable = true; # For emmet support.
+    emmet-ls.enable = true; # For emmet support.
     eslint.enable = true; # For JavaScript.
     html.enable = true; # For HTML.
     jsonls.enable = true; # There's one for JSON?
     lemminx.enable = true; # And for XML?
     ltex.enable = true; # And for LanguageTool, too?
     lua-ls.enable = true; # For Lua.
-    nil_ls.enable = true; # For Nix.
+    nil-ls.enable = true; # For Nix.
     nushell.enable = true; # For Nushell.
     pyright.enable = true; # For Python.
 
diff --git a/configs/nixvim/fiesta/modules/setups/treesitter.nix b/configs/nixvim/fiesta/modules/setups/treesitter.nix
index a9341cc0..4d1379c5 100644
--- a/configs/nixvim/fiesta/modules/setups/treesitter.nix
+++ b/configs/nixvim/fiesta/modules/setups/treesitter.nix
@@ -43,8 +43,10 @@ in
 
       # Enable all of its useful features.
       folding = true;
-      indent = true;
-      incrementalSelection.enable = true;
+      settings = {
+        indent.enable = true;
+        incremental_selection.enable = true;
+      };
     };
 
     # Enable some more context for me.
@@ -94,7 +96,7 @@ in
       }]
       ++ (
         let
-          motions = lib.cartesianProductOfSets {
+          motions = lib.cartesianProduct {
             region = [ "Start" "End" ];
             jumpDirection = [ "Previous" "Next" ];
             variant = [ "outer" "inner" ];
@@ -213,7 +215,7 @@ in
         [{ enable = true; }]
         ++ (
           let
-            motions = lib.cartesianProductOfSets {
+            motions = lib.cartesianProduct {
               jumpDirection = [ "Previous" "Next" ];
               variant = [ "outer" ];
             };
diff --git a/configs/nixvim/trovebelt/modules/setups/treesitter.nix b/configs/nixvim/trovebelt/modules/setups/treesitter.nix
index d950160d..2a55c7ea 100644
--- a/configs/nixvim/trovebelt/modules/setups/treesitter.nix
+++ b/configs/nixvim/trovebelt/modules/setups/treesitter.nix
@@ -20,8 +20,10 @@ in
 
       # Enable all of its useful features.
       folding = true;
-      indent = true;
-      incrementalSelection.enable = true;
+      settings = {
+        indent.enable = true;
+        incremental_selection.enable = true;
+      };
     };
 
     # Enable some more context for me.