diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix
index 808762b..1960e4f 100644
--- a/modules/home-manager/cli/neovim/default.nix
+++ b/modules/home-manager/cli/neovim/default.nix
@@ -68,6 +68,11 @@ in
         cmp-path
         cmp-cmdline
         cmp_luasnip
+        {
+          plugin = fzf-lua;
+          type = "lua";
+          config = (builtins.readFile ./files/fzf-lua.lua);
+        }
         {
           plugin = gitsigns-nvim;
           type = "lua";
@@ -140,11 +145,6 @@ in
           type = "lua";
           config = ( builtins.readFile ./files/treesitter.lua);
         }
-        {
-          plugin = telescope-nvim;
-          type = "lua";
-          config = ( builtins.readFile ./files/telescope.lua );
-        }
         {
           plugin = nvim-treesitter-context;
           type = "lua";
diff --git a/modules/home-manager/cli/neovim/files/fzf-lua.lua b/modules/home-manager/cli/neovim/files/fzf-lua.lua
new file mode 100644
index 0000000..a186a12
--- /dev/null
+++ b/modules/home-manager/cli/neovim/files/fzf-lua.lua
@@ -0,0 +1 @@
+require('fzf-lua').setup()
diff --git a/modules/home-manager/cli/neovim/files/neotree.lua b/modules/home-manager/cli/neovim/files/neotree.lua
index f1d1728..da3b336 100644
--- a/modules/home-manager/cli/neovim/files/neotree.lua
+++ b/modules/home-manager/cli/neovim/files/neotree.lua
@@ -1,5 +1,6 @@
 local neotree = require 'neo-tree'
 neotree.setup({
+    close_if_last_window = true,
     filesystem = {
         filtered_items = {
             -- when true, they will just be displayed differently 
@@ -18,8 +19,7 @@ neotree.setup({
     }
 })
 
-vim.keymap.set('n', '<leader>ns', ':Neotree show<cr>', {desc='Neotree [S]how'})
 vim.keymap.set('n', '<leader>nc', ':Neotree close<cr>', {desc='Neotree [C]lose'})
-vim.keymap.set('n', '<leader>nf', ':Neotree focus<cr>', {desc='Neotree [F]ocus'})
-vim.keymap.set('n', '<leader>nb', ':Neotree show buffers<cr>', {desc='Neotree Nvim [B]uffers'})
-vim.keymap.set('n', '<leader>ng', ':Neotree show git_status<cr>', {desc='Neotree [G]it status'})
+vim.keymap.set('n', '<leader>nf', ':Neotree focus filesystem<cr>', {desc='Neotree [F]ocus'})
+vim.keymap.set('n', '<leader>nb', ':Neotree focus buffers<cr>', {desc='Neotree Nvim [B]uffers'})
+vim.keymap.set('n', '<leader>ng', ':Neotree focus git_status<cr>', {desc='Neotree [G]it status'})
diff --git a/modules/home-manager/cli/neovim/files/telescope.lua b/modules/home-manager/cli/neovim/files/telescope.lua
deleted file mode 100644
index 0fb3871..0000000
--- a/modules/home-manager/cli/neovim/files/telescope.lua
+++ /dev/null
@@ -1,49 +0,0 @@
-require('telescope').setup{
-  defaults = {
-    mappings = {
-      i = {
-        -- map actions.which_key to <C-h> (default: <C-/>)
-        -- actions.which_key shows the mappings for your picker,
-        -- e.g. git_{create, delete, ...}_branch for the git_branches picker
-        ["<C-h>"] = "which_key"
-      }
-    }
-  },
-  pickers = {
-    -- Default configuration for builtin pickers goes here:
-    -- picker_name = {
-    --   picker_config_key = value,
-    --   ...
-    -- }
-    -- Now the picker_config_key will be applied every time you call this
-    -- builtin picker
-    find_files = {
-      theme = "dropdown",
-    }
-  },
-  extensions = {
-    -- Your extension configuration goes here:
-    -- extension_name = {
-    --   extension_config_key = value,
-    -- }
-    -- please take a look at the readme of the extension you want to configure
-  }
-}
-
--- Define keybinging for Telescope
-
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {
-    table.unpack(opts), desc = 'Telescope: find files'
-})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {
-    table.unpack(opts), desc = 'Telescope: find Nvim buffers'
-})
-
--- Git actions
-vim.keymap.set('n', '<leader>fgf', builtin.git_files, {
-    table.unpack(opts), desc = 'Telescope: find Git files'
-})
-vim.keymap.set('n', '<leader>fgc', builtin.git_commits, {
-    table.unpack(opts), desc = 'Telescope: find Git commits'
-})
diff --git a/modules/home-manager/cli/utils/default.nix b/modules/home-manager/cli/utils/default.nix
index a30c0e7..58dc031 100644
--- a/modules/home-manager/cli/utils/default.nix
+++ b/modules/home-manager/cli/utils/default.nix
@@ -15,17 +15,26 @@ in
         theme = "base16";
       };
     };
+    programs.eza = {
+      enable = true;
+      icons = true;
+    };
+    programs.fd = {
+      enable = true;
+
+    };
+    programs.fzf = {
+      enable = true;
+    };
+    programs.ripgrep = {
+      enable = true;
+    };
 
-    home.packages = with pkgs; [
-      eza
-    ];
-    
     home = {
       sessionVariables = {
         EXA_COLORS = "xx=2";
       };
       shellAliases = {
-        ls = "eza";
         cat = "bat";
       };
     };