diff --git a/configuration.nix b/configuration.nix
index 424d7173..80a34157 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;
 
@@ -184,6 +184,7 @@ isMaximal: {
       project-nvim.enable = isMaximal;
     };
 
+    undotree.enable = isMaximal;
     utility = {
       ccc.enable = false;
       vim-wakatime.enable = false;
@@ -194,7 +195,6 @@ isMaximal: {
       leetcode-nvim.enable = isMaximal;
       multicursors.enable = isMaximal;
       smart-splits.enable = isMaximal;
-
       motion = {
         hop.enable = true;
         leap.enable = true;
@@ -238,7 +238,10 @@ isMaximal: {
           nix = "110";
           ruby = "120";
           java = "130";
-          go = ["90" "130"];
+          go = [
+            "90"
+            "130"
+          ];
         };
       };
       fastaction.enable = true;
diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix
index 8069b6c1..79d7d924 100644
--- a/modules/plugins/utility/default.nix
+++ b/modules/plugins/utility/default.nix
@@ -26,5 +26,6 @@
     ./wakatime
     ./yanky-nvim
     ./yazi-nvim
+    ./undotree
   ];
 }
diff --git a/modules/plugins/utility/undotree/config.nix b/modules/plugins/utility/undotree/config.nix
new file mode 100644
index 00000000..7f2ffeba
--- /dev/null
+++ b/modules/plugins/utility/undotree/config.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  vim.lazy.plugins.undotree = {
+    cmd = [ "UndotreeToggle" ];
+  };
+}
diff --git a/modules/plugins/utility/undotree/default.nix b/modules/plugins/utility/undotree/default.nix
new file mode 100644
index 00000000..012d8454
--- /dev/null
+++ b/modules/plugins/utility/undotree/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./undotree.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/plugins/utility/undotree/undotree.nix b/modules/plugins/utility/undotree/undotree.nix
index 936253e5..be9a92ab 100644
--- a/modules/plugins/utility/undotree/undotree.nix
+++ b/modules/plugins/utility/undotree/undotree.nix
@@ -1,25 +1,9 @@
 { lib, ... }:
 let
-  inherit (lib.types) bool int;
-  inherit (lib.options) mkEnableOption mkOption;
-
-  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.options) mkEnableOption;
 in
 {
   options.vim.undotree = {
     enable = mkEnableOption "undotree";
-    setupOpts = mkPluginSetupOption "undotree" {
-      # enable_feature_a = mkOption {
-      #   type = bool;
-      #   default = false;
-      #   # ...
-      # };
-      #
-      # number_option = mkOption {
-      #   type = int;
-      #   default = 3;
-      #   # ...
-      # };
-    };
   };
 }