diff --git a/lua/weeheavy/remap.lua b/lua/weeheavy/remap.lua
index 2206e87..fc20db9 100644
--- a/lua/weeheavy/remap.lua
+++ b/lua/weeheavy/remap.lua
@@ -5,13 +5,33 @@ vim.g.mapleader = " "
 
 vim.keymap.set("n", "<leader>r", vim.cmd.Ex, { noremap = true, desc = "netrw File Browser" }) -- netrw file explorer
 
-vim.keymap.set("n", "<leader>e", ":Telescope file_browser hidden=true previewer=false display_stat=false<CR>", { noremap = true, desc = "Directory browser" })
+vim.keymap.set(
+	"n",
+	"<leader>e",
+	":Telescope file_browser hidden=true previewer=false display_stat=false<CR>",
+	{ noremap = true, desc = "Directory browser" }
+)
 vim.keymap.set("n", "<leader>fo", ":Telescope oldfiles<CR>", { noremap = true, desc = "File history" })
-vim.keymap.set("n", "<leader>ff", ":Telescope find_files hidden=true no_ignore=false <CR>", { noremap = true, desc = "File search" })
+vim.keymap.set(
+	"n",
+	"<leader>ff",
+	":Telescope find_files hidden=true no_ignore=false <CR>",
+	{ noremap = true, desc = "File search" }
+)
 vim.keymap.set("n", "<leader>fg", ":Telescope live_grep<CR>", { noremap = true, desc = "Live grep through all files" })
-vim.keymap.set("n", "<leader><leader>", ":Telescope buffers preview=false<CR>", { noremap = true, desc = "Show open buffers" })
+vim.keymap.set(
+	"n",
+	"<leader><leader>",
+	":Telescope buffers preview=false<CR>",
+	{ noremap = true, desc = "Show open buffers" }
+)
 vim.keymap.set("n", "<leader>gst", ":Telescope git_status<CR>", { noremap = true, desc = "Git status" })
-vim.keymap.set("n", "<leader>gla", ":Telescope git_commits<CR>", { noremap = true, desc = "Git log (across all files)" })
+vim.keymap.set(
+	"n",
+	"<leader>gla",
+	":Telescope git_commits<CR>",
+	{ noremap = true, desc = "Git log (across all files)" }
+)
 vim.keymap.set("n", "<leader>glf", ":Telescope git_bcommits<CR>", { noremap = true, desc = "Git log (this file)" })
 vim.keymap.set("n", "<leader>gdp", ":Gitsigns diffthis<CR>", { noremap = true, desc = "Git diff previous (this file)" })
 
@@ -32,4 +52,19 @@ vim.keymap.set("n", "<C-u>", "<C-u>zz") -- eye-friendly up scrolling
 
 vim.keymap.set("n", "J", "mzJ`z") -- when merging lines, keep cursor at current position
 
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], { noremap = true, desc = "Replace word below cursor" })
+vim.keymap.set(
+	"n",
+	"<leader>s",
+	[[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
+	{ noremap = true, desc = "Replace word below cursor" }
+)
+
+-- Apply conform.nvim formatting on keypress (same as on save)
+vim.keymap.set({ "n", "v" }, "<leader>o", function()
+	local conform = require("conform")
+	conform.format({
+		lsp_fallback = true,
+		async = false,
+		timeout_ms = 500,
+	})
+end, { desc = "Format file or range (in visual mode)" })