diff --git a/hosts/common/configs/user/console/neovim/default.nix b/hosts/common/configs/user/console/neovim/default.nix
index ca4e988..ee65f2a 100644
--- a/hosts/common/configs/user/console/neovim/default.nix
+++ b/hosts/common/configs/user/console/neovim/default.nix
@@ -1,5 +1,10 @@
 { user, home }:
-{ inputs, ... }:
+{
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
 {
   environment.persistence = {
     "/persist/state"."${home}/.local/share/nvf" = { };
@@ -21,13 +26,12 @@
             viAlias = true;
             vimAlias = true;
 
-            # autocomplete = {
-            #   blink-cmp.enable = true;
-            #   enableSharedCmpSources = true;
-            # };
+            autocomplete = {
+              blink-cmp.enable = true;
+            };
 
             binds = {
-              hardtime-nvim.enable = true;
+              # hardtime-nvim.enable = true;
               whichKey.enable = true;
             };
 
@@ -51,10 +55,11 @@
                 setupOpts = {
                   git_status_async = true;
 
-                  filesystem = {
-                    position = "current";
-                    hijack_netrw_behavior = "open_current";
-                  };
+                  window.mappings = lib.generators.mkLuaInline ''
+                    {
+                      ["<space>"] = "noop",
+                    }
+                  '';
                 };
               };
             };
@@ -89,6 +94,15 @@
               nix = {
                 enable = true;
                 format.type = "nixfmt";
+                lsp.options.nil = {
+                  nix = {
+                    maxMemoryMB = null;
+                    flake = {
+                      autoArchive = true;
+                      autoEvalInputs = true;
+                    };
+                  };
+                };
               };
               php.enable = true;
               python.enable = true;
@@ -135,7 +149,9 @@
             tabline = {
               nvimBufferline = {
                 enable = true;
+                mappings.closeCurrent = "<leader>bd";
                 setupOpts.options = {
+                  indicator.style = "icon";
                   show_close_icon = false;
                   show_buffer_close_icons = false;
                 };
@@ -144,6 +160,15 @@
 
             telescope = {
               enable = true;
+              setupOpts.defaults.file_ignore_patterns = [
+                "node_modules"
+                "%.venv/"
+                "%.git/"
+                "dist/"
+                "build/"
+                "target/"
+                "result/"
+              ];
             };
 
             terminal = {
@@ -182,10 +207,9 @@
               motion = {
                 precognition.enable = true;
               };
-              # multicursors.enable = true;
               # nvim-biscuits.enable = true;
               # smart-splits.enable = true;
-              # surround.enable = true;
+              surround.enable = true;
               # undotree.enable = true;
               # yazi-nvim.enable = true;
             };
@@ -199,6 +223,7 @@
               # nvim-scrollbar.enable = true;
               nvim-web-devicons.enable = true;
             };
+
             keymaps = [
               {
                 mode = [ "n" ];
@@ -265,7 +290,10 @@
         };
       };
 
-      zsh.p10k.extraRightPromptElements = [ "vim_shell" ];
+      zsh = {
+        p10k.extraRightPromptElements = [ "vim_shell" ];
+        shellAliases.v = "nvim";
+      };
     };
   };
 }