diff --git a/flake.lock b/flake.lock
index 171f7c8..d867d77 100644
--- a/flake.lock
+++ b/flake.lock
@@ -365,6 +365,23 @@
         "type": "github"
       }
     },
+    "nvim-web-devicons": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1742215722,
+        "narHash": "sha256-JKOvXJr1s2lpP5aeRE7OC3IeOrF5uJxg/Tal3eScd6g=",
+        "owner": "nvim-tree",
+        "repo": "nvim-web-devicons",
+        "rev": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-tree",
+        "ref": "master",
+        "repo": "nvim-web-devicons",
+        "type": "github"
+      }
+    },
     "parrot-nvim": {
       "flake": false,
       "locked": {
@@ -446,6 +463,7 @@
         "nixpkgs-24-05": "nixpkgs-24-05",
         "nixpkgs-24-11": "nixpkgs-24-11",
         "nomodoro": "nomodoro",
+        "nvim-web-devicons": "nvim-web-devicons",
         "parrot-nvim": "parrot-nvim",
         "sops-nix": "sops-nix",
         "spaceport-nvim": "spaceport-nvim",
diff --git a/flake.nix b/flake.nix
index 83ccecf..4d81bf1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Custom Vim Plugins
     cmp-vimtex = {
       url = "github:micangl/cmp-vimtex/master";
       flake = false;
@@ -62,6 +63,11 @@
       flake = false;
     };
 
+    nvim-web-devicons = {
+      url = "github:nvim-tree/nvim-web-devicons/master";
+      flake = false;
+    };
+
     zsh-completions = {
       url = "github:zsh-users/zsh-completions/master";
       flake = false;
diff --git a/home/deepak/home.nix b/home/deepak/home.nix
index 9a5d207..19fb291 100644
--- a/home/deepak/home.nix
+++ b/home/deepak/home.nix
@@ -147,7 +147,8 @@ in
       cmp_luasnip
       nvim-lspconfig
 
-      vim-vinegar
+	  # vim-vinegar
+      oil-nvim
 
       wiki-vim
       vim-markdown
@@ -180,6 +181,7 @@ in
       pkgs.customVimPlugins.spaceport-nvim
       pkgs.customVimPlugins.nomodoro
       pkgs.customVimPlugins.parrot-nvim
+      pkgs.customVimPlugins.nvim-web-devicons
 
       # syntax highlighting
       vim-just
diff --git a/home/deepak/neovim/init-vim.nix b/home/deepak/neovim/init-vim.nix
index 3e6edcc..67b7ff0 100644
--- a/home/deepak/neovim/init-vim.nix
+++ b/home/deepak/neovim/init-vim.nix
@@ -32,12 +32,16 @@
   	file = '\\v\\.(aux|bbl|blg|bcf|fdb_latexmk|fls|run.xml|tdo|toc|log|pdf)$'
   }
 
-  ${builtins.readFile ./spaceport.lua}
   require('gitsigns').setup()
+  require("oil").setup()
 
-  -- load file browser
+  -- require("nvim-web-devicons").setup({})
+
+  -- load file browser and telescope
   ${builtins.readFile ./telescope.lua}
 
+  ${builtins.readFile ./spaceport.lua}
+
   -- color scheme
   require("rose-pine").setup({})
   require("kanagawa").setup({})
@@ -236,11 +240,6 @@
   vim.api.nvim_set_keymap("n", "<leader>ns", "<cmd>NomoStop<CR>", { noremap = true})
   vim.api.nvim_set_keymap("n", "<leader>nm", "<cmd>NomoMenu<CR>", { noremap = true})
 
-  vim.api.nvim_set_keymap("n", "<leader>tt", "<cmd>Telescope<CR>", {noremap = true})
-  vim.api.nvim_set_keymap("n", "<leader>tg", "<cmd>Telescope live_grep<CR>", {noremap = true})
-  vim.api.nvim_set_keymap("n", "<leader>to", "<cmd>Telescope find_files<CR>", {noremap = true})
-  vim.api.nvim_set_keymap("n", "<leader>tb", "<cmd>Telescope file_browser<CR>", {noremap = true}) 
-
   ${builtins.readFile ./lualine.lua}
 
   EOF
diff --git a/home/deepak/neovim/telescope.lua b/home/deepak/neovim/telescope.lua
index 6f4f9bd..e018da6 100644
--- a/home/deepak/neovim/telescope.lua
+++ b/home/deepak/neovim/telescope.lua
@@ -8,3 +8,10 @@ require("telescope").setup {
 }
 
 require("telescope").load_extension "file_browser"
+require('telescope').load_extension('fzf')
+
+vim.api.nvim_set_keymap("n", "<leader>tt", "<cmd>Telescope<CR>", {noremap = true})
+vim.api.nvim_set_keymap("n", "<leader>tg", "<cmd>Telescope live_grep<CR>", {noremap = true})
+vim.api.nvim_set_keymap("n", "<leader>to", "<cmd>Telescope find_files<CR>", {noremap = true})
+vim.api.nvim_set_keymap("n", "<leader>tb", "<cmd>Telescope file_browser<CR>", {noremap = true}) 
+
diff --git a/overlays/default.nix b/overlays/default.nix
index 994ae3c..9640858 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -27,6 +27,11 @@ let
         name = "parrot-nvim";
       };
 
+      nvimWebDeviconPlugin = prev.vimUtils.buildVimPlugin {
+        src = inputs.nvim-web-devicons;
+        name = "nvim-web-devicons";
+      };
+
       zshCompletionPlugin = {
         name = "zsh-completions";
         src = inputs.zsh-completions;
@@ -38,6 +43,7 @@ let
         spaceport-nvim = spaceportNvimPlugin;
         nomodoro = nomodoroNvimPlugin;
         parrot-nvim = parrotNvimPlugin;
+        nvim-web-devicons = nvimWebDeviconPlugin;
       };
 
       customZshPlugins = {