diff --git a/lua/config/maps.lua b/lua/config/maps.lua
index 2647cf4..50288e1 100644
--- a/lua/config/maps.lua
+++ b/lua/config/maps.lua
@@ -5,3 +5,20 @@ map("n", "<leader>e", "<cmd>NvimTreeToggle<CR>", { desc = "NvimTree" })
 map("n", "<leader>f", function()
   require("conform").format { async = true }
 end, { desc = "Format buffer" })
+
+map("n", "<C-h>", "<C-w>h", { desc = "switch window left" })
+map("n", "<C-l>", "<C-w>l", { desc = "switch window right" })
+map("n", "<C-j>", "<C-w>j", { desc = "switch window down" })
+map("n", "<C-k>", "<C-w>k", { desc = "switch window up" })
+
+map("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" })
+
+map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "toggle line number" })
+
+map("n", "<leader>/", "gcc", { desc = "toggle comment", remap = true })
+map("v", "<leader>/", "gc", { desc = "toggle comment", remap = true })
+
+map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
+
+map("n", "<leader>th", "<cmd>ToggleTerm direction=horizontal<cr>", { desc = "ToggleTerm: horizontal" })
+map("n", "<leader>tf", "<cmd>ToggleTerm direction=float<cr>", { desc = "ToggleTerm: float" })
diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua
deleted file mode 100644
index 93604bb..0000000
--- a/lua/plugins/nvim-tree.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  "nvim-tree/nvim-tree.lua",
-  version = "*",
-  lazy = false,
-  dependencies = {
-    "nvim-tree/nvim-web-devicons",
-  },
-  config = function()
-    require("nvim-tree").setup {}
-  end,
-}