diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index f77c787..534b148 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -25,5 +25,7 @@
   "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }
+  "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
+  "vim-test": { "branch": "master", "commit": "6acc7d96487abaaa57a19b0d43efaea6633d6bb7" },
+  "vimux": { "branch": "master", "commit": "f7c41607d9246ec4b6cc28587cce84d75d106e3e" }
 }
\ No newline at end of file
diff --git a/config/nvim/lua/plugins/neotree.lua b/config/nvim/lua/plugins/neotree.lua
index c6e2216..52b2e6d 100644
--- a/config/nvim/lua/plugins/neotree.lua
+++ b/config/nvim/lua/plugins/neotree.lua
@@ -7,6 +7,12 @@ return {
 		"MunifTanjim/nui.nvim",
 	},
 	config = function()
+    require("neo-tree").setup({
+      close_if_last_window = true,
+    })
 		vim.keymap.set("n", "<C-n>", ":Neotree filesystem reveal left<CR>", {})
+
+
+
 	end,
 }
diff --git a/config/nvim/lua/plugins/vim-test.lua b/config/nvim/lua/plugins/vim-test.lua
new file mode 100644
index 0000000..a0824de
--- /dev/null
+++ b/config/nvim/lua/plugins/vim-test.lua
@@ -0,0 +1,12 @@
+return {
+  "vim-test/vim-test",
+  dependencies = {
+    "preservim/vimux"
+  },
+  vim.keymap.set('n', '<leader>t', ':TestNearest<CR>'),
+  vim.keymap.set('n', '<leader>T', ':TestFile<CR>'),
+  vim.keymap.set('n', '<leader>a', ':TestSuite<CR>'),
+  vim.keymap.set('n', '<leader>l', ':TestLast<CR>'),
+  vim.keymap.set('n', '<leader>g', ':TestVisit<CR>'),
+  vim.cmd("let test#strategy = 'vimux'"),
+}
diff --git a/config/nvim/lua/vim-options.lua b/config/nvim/lua/vim-options.lua
index 96ea9cd..f994753 100644
--- a/config/nvim/lua/vim-options.lua
+++ b/config/nvim/lua/vim-options.lua
@@ -2,4 +2,32 @@ vim.cmd("set expandtab")
 vim.cmd("set tabstop=2")
 vim.cmd("set softtabstop=2")
 vim.cmd("set shiftwidth=2")
+vim.cmd("map s <Nop>")
+
+
+vim.keymap.set("n", "<Space>", "<Nop>", { silent = true, remap = false })
 vim.g.mapleader = " "
+
+
+-- vim.keymap.set("n", "<M-h>", "<Nop>", { silent = true, remap = true })
+
+-- vim.cmd("nnoremap <M-p> :echom 'p'<cr>")
+-- vim.cmd("nnoremap <M-h> :wincmd h<cr>")
+-- vim.cmd("nnoremap <M-j> :wincmd j<cr>")
+-- vim.cmd("nnoremap <M-k> :wincmd k<cr>")
+-- vim.cmd("nnoremap <M-l> :wincmd l<cr>")
+
+
+vim.keymap.set('n', '<C-h>', ':wincmd h<CR>')
+vim.keymap.set('n', '<C-j>', ':wincmd j<CR>')
+vim.keymap.set('n', '<C-k>', ':wincmd k<CR>')
+vim.keymap.set('n', '<C-l>', ':wincmd l<CR>')
+-- vim.keymap.set('n', '<M-h>', ':wincmd h<CR>')
+-- vim.keymap.set('n', '<M-j>', ':wincmd j<CR>')
+-- vim.keymap.set('n', '<M-k>', ':wincmd k<CR>')
+-- vim.keymap.set('n', '<M-l>', ':wincmd l<CR>')
+
+vim.keymap.set('n', '<leader>h', ':nohlsearch<CR>')
+
+
+