diff --git a/nvim/init.lua b/nvim/init.lua
index ce278b6a..e22027e4 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -76,7 +76,15 @@ vim.keymap.set("n", "<leader>e", "<Cmd> Neotree focus <CR>")
 -- LSP --
 vim.keymap.set("n", "<leader>gd", vim.lsp.buf.definition)
 vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action)
+vim.keymap.set("n", "<leader>ra", vim.lsp.buf.rename)
 vim.keymap.set("n", "<leader>lf", vim.diagnostic.open_float)
 
 -- Search --
 vim.keymap.set("n", "<ESC>", "<Cmd> noh <CR>")
+
+-- Tmux navigator --
+vim.keymap.set("n", "<c-h>", "<cmd>TmuxNavigateLeft<cr>")
+vim.keymap.set("n", "<c-j>", "<cmd>TmuxNavigateDown<cr>")
+vim.keymap.set("n", "<c-k>", "<cmd>TmuxNavigateUp<cr>")
+vim.keymap.set("n", "<c-l>", "<cmd>TmuxNavigateRight<cr>")
+vim.keymap.set("n", "<c-\\>", "<cmd>TmuxNavigatePrevious<cr>")
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index 7f205c7e..92b14ac2 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -1,4 +1,14 @@
 return {
+	{
+		"christoomey/vim-tmux-navigator",
+		cmd = {
+			"TmuxNavigateLeft",
+			"TmuxNavigateDown",
+			"TmuxNavigateUp",
+			"TmuxNavigateRight",
+			"TmuxNavigatePrevious",
+		},
+	},
 	{
 		"windwp/nvim-autopairs",
 		event = "InsertEnter",
@@ -43,7 +53,7 @@ return {
 		config = function()
 			local ft = require("guard.filetype")
 			ft("lua"):fmt("lsp"):append("stylua")
-			ft("typescript,javascript,typescriptreact"):fmt("prettierd"):lint("eslint_d")
+			ft("typescript,javascript,typescriptreact"):fmt("prettierd")
 		end,
 	},
 	{
@@ -77,12 +87,6 @@ return {
 				"s1n7ax/nvim-window-picker",
 				version = "2.*",
 				config = function()
-					require("neo-tree").setup({
-						update_focused_file = {
-							enable = true,
-						},
-					})
-
 					require("window-picker").setup({
 						filter_rules = {
 							include_current_win = false,
@@ -101,8 +105,14 @@ return {
 		},
 		config = function()
 			require("neo-tree").setup({
-				close_if_last_window = false,
+				filesystem = {
+					follow_current_file = {
+						enabled = true,
+					},
+				},
+				close_if_last_window = true,
 			})
+			vim.cmd([[nnoremap \ :Neotree reveal<cr>]])
 		end,
 	},
 	{