diff --git a/configuration.nix b/configuration.nix
index ac0ad32b..424d7173 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -43,7 +43,7 @@ isMaximal: {
     # This section does not include a comprehensive list of available language modules.
     # To list all available language module options, please visit the nvf manual.
     languages = {
-      enableFormat = true;
+      enableFormat = true; #
       enableTreesitter = true;
       enableExtraDiagnostics = true;
 
@@ -194,7 +194,7 @@ isMaximal: {
       leetcode-nvim.enable = isMaximal;
       multicursors.enable = isMaximal;
       smart-splits.enable = isMaximal;
-      undotree.enable = isMaximal;
+
       motion = {
         hop.enable = true;
         leap.enable = true;
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index c4ad963c..e18c95fe 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -37,7 +37,6 @@
 [snacks.nvim]: https://github.com/folke/snacks.nvim
 [oil.nvim]: https://github.com/stevearc/oil.nvim
 [hunk.nvim]: https://github.com/julienvincent/hunk.nvim
-[undotree]: https://github.com/mbbill/undotree
 
 - Add [typst-preview.nvim] under
   `languages.typst.extensions.typst-preview-nvim`.
diff --git a/modules/plugins/languages/wgsl.nix b/modules/plugins/languages/wgsl.nix
index 44323092..f374543e 100644
--- a/modules/plugins/languages/wgsl.nix
+++ b/modules/plugins/languages/wgsl.nix
@@ -26,7 +26,7 @@
           cmd = ${
           if isList cfg.lsp.package
           then expToLua cfg.lsp.package
-          else "{'${cfg.lsp.package}/bin/wgsl-analyzer'}"
+          else "{'${cfg.lsp.package}/bin/wgsl_analyzer'}"
         }
         }
       '';
diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index d761d6b3..80a30a5a 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/modules/plugins/treesitter/treesitter.nix
@@ -25,7 +25,7 @@ in {
       type = listOf package;
       default = [];
       example = literalExpression ''
-        with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+        pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
           regex
           kdl
         ];
@@ -33,7 +33,6 @@ in {
       description = ''
         List of treesitter grammars to install. For grammars to be installed properly,
         you must use grammars from `pkgs.vimPlugins.nvim-treesitter.builtGrammars`.
-        You can use `pkgs.vimPlugins.nvim-treesitter.allGrammars` to install all grammars.
 
         For languages already supported by nvf, you may use
         {option}`vim.language.<lang>.treesitter` options, which will automatically add
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 79d7d924..8069b6c1 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -26,6 +26,5 @@
     ./wakatime
     ./yanky-nvim
     ./yazi-nvim
-    ./undotree
   ];
 }
diff --git a/modules/plugins/utility/undotree/config.nix b/modules/plugins/utility/undotree/config.nix
deleted file mode 100644
index d954d49f..00000000
--- a/modules/plugins/utility/undotree/config.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  vim.lazy.plugins.undotree = {
-    package = "undotree";
-    cmd = [
-      "UndotreeToggle"
-      "UndotreeShow"
-      "UndotreeHide"
-      "UndotreePersistUndo"
-      "UndotreeFocus"
-    ];
-  };
-}
diff --git a/modules/plugins/utility/undotree/default.nix b/modules/plugins/utility/undotree/default.nix
deleted file mode 100644
index 012d8454..00000000
--- a/modules/plugins/utility/undotree/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./undotree.nix
-    ./config.nix
-  ];
-}
diff --git a/modules/plugins/utility/undotree/undotree.nix b/modules/plugins/utility/undotree/undotree.nix
deleted file mode 100644
index 70846737..00000000
--- a/modules/plugins/utility/undotree/undotree.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-in {
-  options.vim.utility.undotree = {
-    enable = mkEnableOption "undo history visualizer for Vim [undotree]";
-  };
-}
diff --git a/npins/sources.json b/npins/sources.json
index 3c3bc3c3..00dcea83 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -2497,19 +2497,6 @@
       "url": "https://github.com/chomosuke/typst-preview.nvim/archive/dea4525d5420b7c32eebda7de15a6beb9d6574fa.tar.gz",
       "hash": "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"
     },
-    "undotree": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "mbbill",
-        "repo": "undotree"
-      },
-      "branch": "master",
-      "submodules": false,
-      "revision": "28f2f54a34baff90ea6f4a735ef1813ad875c743",
-      "url": "https://github.com/mbbill/undotree/archive/28f2f54a34baff90ea6f4a735ef1813ad875c743.tar.gz",
-      "hash": "0k9qfp64rbwy1lc62x0vkwfl3qlx8633lfbhqxkf64yqwi81ysp5"
-    },
     "vim-dirtytalk": {
       "type": "Git",
       "repository": {