diff --git a/user/config/nvim/lua/u/plugins/init.lua b/user/config/nvim/lua/u/plugins/init.lua
index 0a87de4..a774ae4 100644
--- a/user/config/nvim/lua/u/plugins/init.lua
+++ b/user/config/nvim/lua/u/plugins/init.lua
@@ -1,6 +1,12 @@
 require('u.plugins.lsp')
 require('u.plugins.cmp')
 
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
+vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
+
 local statusline = require('mini.statusline')
 statusline.setup()
 statusline.section_location = function()
@@ -38,8 +44,11 @@ bufferline.setup({
   }
 })
 
+require('undotree.action').nop = function() end
 require('undotree').setup({
-  window = {
-    winblend = 0
+  window = { winblend = 0 },
+  keymaps = {
+    ['L'] = "nop",
+    ['H'] = "nop",
   }
 })
diff --git a/user/config/nvim/lua/u/plugins/lsp.lua b/user/config/nvim/lua/u/plugins/lsp.lua
index c003dea..af6251d 100644
--- a/user/config/nvim/lua/u/plugins/lsp.lua
+++ b/user/config/nvim/lua/u/plugins/lsp.lua
@@ -10,12 +10,13 @@ vim.api.nvim_create_autocmd('LspAttach', {
       vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
     end
 
-    map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-    map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-    map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-    map('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
-    map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-    map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+    local builtin = require('telescope.builtin')
+    map('gd', builtin.lsp_definitions, '[G]oto [D]efinition')
+    map('gr', builtin.lsp_references, '[G]oto [R]eferences')
+    map('gI', builtin.lsp_implementations, '[G]oto [I]mplementation')
+    map('<leader>D', builtin.lsp_type_definitions, 'Type [D]efinition')
+    map('<leader>ds', builtin.lsp_document_symbols, '[D]ocument [S]ymbols')
+    map('<leader>ws', builtin.lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
     map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
     map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
     map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')