diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua
index c6b0eb8..832052d 100644
--- a/dot_config/nvim/init.lua
+++ b/dot_config/nvim/init.lua
@@ -1,2 +1,3 @@
 require("settings")
+require("keymap")
 require("config.lazy")
diff --git a/dot_config/nvim/lua/keymap.lua b/dot_config/nvim/lua/keymap.lua
new file mode 100644
index 0000000..f22beac
--- /dev/null
+++ b/dot_config/nvim/lua/keymap.lua
@@ -0,0 +1,32 @@
+local function map(mode, lhs, rhs, desc, opts)
+  local options = { noremap = true, silent = true }
+  if opts then
+    options = vim.tbl_extend("force", options, opts)
+  end
+  vim.keymap.set(mode, lhs, rhs, vim.tbl_extend("force", options, { desc = desc }))
+end
+
+-- Buffer navigation
+map("n", "<S-h>", "<cmd>bp<cr>", "")
+map("n", "<S-k>", "<cmd>bn<cr>", "")
+map("n", "<leader>bb", "<cmd>e #<cr>", "Switch to other buffer")
+map("n", "<leader>`", "<cmd>e #<cr>", "Switch to other buffer")
+map("n", "<leader>bd", "<cmd>bd<cr>", "Delete buffer")
+map("n", "<leader>bp", "<cmd>bp<cr>", "Previous buffer")
+map("n", "<leader>bn", "<cmd>bn<cr>", "Next buffer")
+
+-- Better indentation
+map("v", "<", "<gv")
+map("v", ">", ">gv")
+
+-- Lazy
+map("n", "<leader>l", "<cmd>Lazy<cr>", "Lazy")
+
+-- Mason
+map("n", "<leader>cm", "<cmd>Mason<cr>", "Mason")
+
+-- Clear search on escape
+map({ "i", "n", "s" }, "<esc>", function()
+  vim.cmd("noh")
+  return "<esc>"
+end, "", { expr = true })
diff --git a/dot_config/nvim/lua/plugins/telescope.lua b/dot_config/nvim/lua/plugins/telescope.lua
index 81b5a59..4448c6c 100644
--- a/dot_config/nvim/lua/plugins/telescope.lua
+++ b/dot_config/nvim/lua/plugins/telescope.lua
@@ -24,6 +24,21 @@ return {
         "<cmd>Telescope current_buffer_fuzzy_find<cr>",
         desc = "Search in buffer",
       },
+      {
+        "<leader>cd",
+        "<cmd>Telescope diagnostics bufnr=0<cr>",
+        desc = "List diagnostics",
+      },
+      {
+        "<leader>sp",
+        "<cmd>Telescope live_grep<cr>",
+        desc = "Search in project",
+      },
+      {
+        "<leader>bb",
+        "<cmd>Telescope buffers<cr>",
+        desc = "Find buffer",
+      },
     },
   },
   {