diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua
index 2c134f7..c83b2e0 100644
--- a/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/nvim/.config/nvim/lua/config/keymaps.lua
@@ -1,3 +1,45 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
--- Add any additional keymaps here
+
+local map = vim.keymap.set
+
+-- save
+map("n", "<C-s>", "<cmd>w<cr>", { desc = "Save file" })
+map("i", "<C-s>", "<esc><cmd>w<cr>", { desc = "Save file" })
+
+-- quit
+map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit all" })
+
+-- better movement
+map("n", "J", "mzJ`z", { desc = "Join lines (keep cursor)" })
+map("n", "<C-d>", "<C-d>zz", { desc = "Scroll down (centered)" })
+map("n", "<C-u>", "<C-u>zz", { desc = "Scroll up (centered)" })
+map("n", "n", "nzzzv", { desc = "Next search (centered)" })
+map("n", "N", "Nzzzv", { desc = "Prev search (centered)" })
+
+-- move lines
+map("v", "J", ":m '>+1<cr>gv=gv", { desc = "Move line down" })
+map("v", "K", ":m '<-2<cr>gv=gv", { desc = "Move line up" })
+
+-- better paste (don't overwrite register)
+map("x", "<leader>p", '"_dP', { desc = "Paste without overwrite" })
+
+-- delete to void register
+map({ "n", "v" }, "<leader>d", '"_d', { desc = "Delete to void" })
+
+-- select all
+map("n", "<C-a>", "ggVG", { desc = "Select all" })
+
+-- buffer navigation
+map("n", "<S-h>", "<cmd>bprevious<cr>", { desc = "Prev buffer" })
+map("n", "<S-l>", "<cmd>bnext<cr>", { desc = "Next buffer" })
+map("n", "<leader>bx", "<cmd>bdelete<cr>", { desc = "Close buffer" })
+
+-- window resize
+map("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase height" })
+map("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease height" })
+map("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease width" })
+map("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase width" })
+
+-- clear search highlight
+map("n", "<Esc>", "<cmd>noh<cr><Esc>", { desc = "Clear search highlight" })