diff --git a/lua/junikim/options.lua b/lua/junikim/options.lua
index 61806cf..460b2a2 100644
--- a/lua/junikim/options.lua
+++ b/lua/junikim/options.lua
@@ -12,6 +12,11 @@ vim.opt.textwidth = 80
 vim.opt.colorcolumn = "80"
 vim.opt.list = true
 
+vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+vim.opt.undofile = true
+vim.opt.hlsearch = false
+vim.opt.incsearch = true
+
 vim.g.airline_theme = "base16_chalk"
 vim.g.airline_powerline_fonts = 1
 
diff --git a/lua/junikim/remap.lua b/lua/junikim/remap.lua
index 7b923e0..ea6b6b4 100644
--- a/lua/junikim/remap.lua
+++ b/lua/junikim/remap.lua
@@ -24,3 +24,11 @@ map("i", "<A-u>", "ū")
 
 map("n", "<F12>", ":w|:!texbld run compile")
 map("n", "<F5>", ":w|:!./test.sh")
+
+vim.keymap.set("x", "<leader>p", [["_dP]])
+vim.keymap.set("n", "<leader>vc", "<cmd>e ~/.config/nvim<CR>");
+vim.keymap.set("n", "<leader>vz", "<cmd>e ~/.zshrc<CR>");
+
+vim.keymap.set("n", "<leader>fmt", function()
+  vim.lsp.buf.formatting_sync()
+end)