diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index dd4f586..1a42e9f 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -92,6 +92,9 @@ keymap("n", "<leader>sw", ":lua require('spectre').open_visual({select_word=true
 keymap("n", "<leader>s", ":lua require('spectre').open_visual()<CR>", opts)
 keymap("n", "<leader>sp", ":lua require('spectre').open_file_search()<CR>", opts)
 
+-- UndoTree
+keymap("n", "<leader>u", ":UndotreeToggle<CR>", opts)
+
 -- Insert --
 
 -- Visual --
diff --git a/lua/user/lsp/init.lua b/lua/user/lsp/init.lua
index 4c7d759..f3ad549 100644
--- a/lua/user/lsp/init.lua
+++ b/lua/user/lsp/init.lua
@@ -3,3 +3,4 @@ require("user.lsp.mason")
 require("user.lsp.nullls")
 require("user.lsp.signature")
 require("user.lsp.lspsaga")
+require("user.lsp.virtuallines")
diff --git a/lua/user/lsp/virtuallines.lua b/lua/user/lsp/virtuallines.lua
new file mode 100644
index 0000000..b10ab7a
--- /dev/null
+++ b/lua/user/lsp/virtuallines.lua
@@ -0,0 +1,10 @@
+local status_ok, lines = pcall(require, "lsp_lines")
+if not status_ok then
+	return
+end
+
+lines.register_lsp_virtual_lines()
+
+vim.diagnostic.config({
+	virtual_text = false,
+})
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index 019f36d..70faaaf 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -73,6 +73,7 @@ return packer.startup(function(use)
 	use("folke/trouble.nvim")
 	use("onsails/lspkind.nvim")
 	use("glepnir/lspsaga.nvim")
+	use("Maan2003/lsp_lines.nvim")
 
 	-- Telescope
 	use("nvim-telescope/telescope.nvim")
@@ -155,6 +156,9 @@ return packer.startup(function(use)
 	-- UI
 	use("stevearc/dressing.nvim")
 
+	-- Undo Tree
+	use("mbbill/undotree")
+
 	if PACKER_BOOTSTRAP then
 		require("packer").sync()
 	end