diff --git a/modules/home/cli/editor/nvf/default.nix b/modules/home/cli/editor/nvf/default.nix
index 408b1d1..b7dfb63 100644
--- a/modules/home/cli/editor/nvf/default.nix
+++ b/modules/home/cli/editor/nvf/default.nix
@@ -9,6 +9,8 @@
       enable = true;
       settings.vim = {
         hideSearchHighlight = true;
+        syntaxHighlighting = true;
+        telescope.enable = true;
         searchCase = "ignore";
         undoFile.enable = true;
         fzf-lua.enable = true;
@@ -26,6 +28,8 @@
         options = import ./options.nix;
         notify = import ./notify.nix;
         snippets = import ./snippets.nix;
+        treesitter = import ./treesitter.nix;
+        ui = import ./ui.nix;
         utility = import ./utility.nix;
         visuals = import ./visuals.nix;
       };
diff --git a/modules/home/cli/editor/nvf/treesitter.nix b/modules/home/cli/editor/nvf/treesitter.nix
new file mode 100644
index 0000000..4c0c3ed
--- /dev/null
+++ b/modules/home/cli/editor/nvf/treesitter.nix
@@ -0,0 +1,7 @@
+{
+  autotagHtml = true;
+  fold = true;
+  context.enable = true;
+  indent.disable = [ "markdown" ];
+  textobjects.enable = true;
+}
diff --git a/modules/home/cli/editor/nvf/ui.nix b/modules/home/cli/editor/nvf/ui.nix
new file mode 100644
index 0000000..db0191a
--- /dev/null
+++ b/modules/home/cli/editor/nvf/ui.nix
@@ -0,0 +1,15 @@
+{
+  borders = {
+    enable = true;
+    globalStyle = "double";
+  };
+  breadcrumbs = {
+    enable = true;
+    navbuddy.enable = true;
+  };
+  colorizer.enable = true;
+  illuminate.enable = true;
+  noice.enable = true;
+  nvim-ufo.enable = true;
+  smartcolumn.enable = true;
+}
diff --git a/modules/home/cli/editor/nvf/utility.nix b/modules/home/cli/editor/nvf/utility.nix
index 585a30a..c27d2ef 100644
--- a/modules/home/cli/editor/nvf/utility.nix
+++ b/modules/home/cli/editor/nvf/utility.nix
@@ -1,4 +1,11 @@
 {
+  direnv.enable = true;
+  leetcode-nvim.enable = true;
+  mkdir.enable = true;
+  motion.leap.enable = true;
+  motion.leap.mappings.leapForwardTo = "s";
+  motion.leap.mappings.leapBackwardTo = "S";
+  vim-wakatime.enable = true;
   yazi-nvim = {
     enable = true;
     mappings = {
diff --git a/modules/home/cli/editor/nvf/visuals.nix b/modules/home/cli/editor/nvf/visuals.nix
index 65a8d5c..82b7575 100644
--- a/modules/home/cli/editor/nvf/visuals.nix
+++ b/modules/home/cli/editor/nvf/visuals.nix
@@ -1,7 +1,7 @@
 {
   indent-blankline.enable = true;
   fidget-nvim.enable = true;
-  fidget-nvim.setupOpts.notification.override_vim_notify = true;
+  # fidget-nvim.setupOpts.notification.override_vim_notify = true;
   nvim-cursorline.enable = true;
   nvim-web-devicons.enable = true;
   rainbow-delimiters.enable = true;