diff --git a/lib/mksystem.nix b/lib/mksystem.nix
index f65f5da..b41e69c 100644
--- a/lib/mksystem.nix
+++ b/lib/mksystem.nix
@@ -50,6 +50,7 @@ in
               "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCpQ8Td98YIS0EtVQ7xabYVe9A9/+ZECrHBpKi01NKQ0Mleg9Z4fnTsdGFX1uhbG6Pu7niBVzYReVTC1CbyVWKmm/4DbbRpaqY94eOzQEe0p4wMSURQ9weuB5737k+5MuLDLUbhc1ytDa84Ubj/A/rQUueKdq2K1o+YSN7b7HKe7kXoXACEpbrSCC43mteBgCtvgsLY0New9xXnvGFJPSe7PcjYkOhSJB1xA0Gu4DoDdOyErvV62QQH4sSQMu5cFICJGfdXQzBdshA8MgWKXFv3Hq7K5/GGDNyCsMxeoPQET3vbmgUsE+KGtcdqizdFM3bAfCBGXOBx6h7BoNuQzkp8hgmrq62CmMwF0krX05Sb3qR/wVjRKDo9pYuSk6/awnnBp5kY6sNgEruI93ZXNQWMkxXQNbmpCi+uEvzMveP16O/uP3NxklD4wtmfpSZsxBi+jRGFqcjdy3Qlc13Tiz98EBaXkir9YwUAh8SNs3gRaJGI0Fn2HzUCPH0zNh42EY8= zoriya@kadan" # server
               "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnPn6ga4tsJfdyGyft9RnJJmSvlGLn/rJuLsWwFHtxHwdcOolZEAn2zrLqOo1Fty44lrWJ62KLOJ+eZVt4rfREBWd+esttTY2BbhrjvRThKsst1RJdWjFXI3xny7v48mMG8PKjTCkXom2Y/wfLKRpeaNJyCgauUNdDFXuiwiMmIEGXN/WE6LfWBg2XbPWilMLEVm6pwXf3lGtaS0QxhIQ/OIdx5XfUKS6lUfRq9Ki6FbsSQ60ejRtKmjbqY93KNQPUBAJnJHgDDX2+pkrSKiNHBjFH5/HZJTSRdpumaqO0E+HZRSEbR/aKRvshUN0SO/59pvrqb1ARF6CG2X0k0A+jTag0N7SyLwHEJ8J/bl43zm0JWenfAPMuhzQqAv3Vw4i13u8mgHf+ng7ClDo1ms5K7e/XXZV7Asb6orkuslZCO2QR3WgfmbUU03r89aG7Eg58ZeGMP57CoEcMAVah20to4iPm5HPy/Ej0JznFXXjRW4z+/DZDvWhFtsjIkalqQCU= u0_a369@localhost" # android
               "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJ/c2rQ9xUI6XpDR/+dmCK5IcxkOIezvNtbC2EVTrfh73H5juotME6JrQSxgQjtgsaUAzZzrac9kI/7Do8/lisbofdKRcneXi2UEeERKrKEwC/EGcQgqnoPLL1+mnqwvQ923d3105DV4hFksoDbblCinFuUr5s55EMm991IL/T70cy820AOgAf+hgleM1Its47EBkZBzpa4KwxYepJG0+kBa7K1Loi9QgBvTGpxs7rWMDxllfL6ivrWJxAKRZdWlJ/MKBVQIYhv0W+vaQ7OZA1qUY4bq/9wY/i88nixbVSPJmikj0+QNeLksU78bOIxLpTTeLdH4HQ6+qKOBT3JhEpBtUHdBxOT5tYJTr4qwjevlFqceLw3x1V9URxPS2XBDjlxnzYzdnD40LK5BehXdmElGio9dy98/qJINbDW/7AH+BpP1GWNKVhiYXPj7A/2fkFD2K7DgIgGlsrZthS+LxDTEcQ8Yx0iD/+nI8LcnvU42S0muSvmP7LE4xBl8AoaI0= zoriya@nixos" # lucca windows
+              "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0lycSIHU5JVcA7M3ChDJliER5MDoaqxWCGX8LeGwklQVwKcUY3y4gO0pD8DRHWrgQv44qP4owxOX7/ulHPjQehzPOU+as3qRH0e76EFutwN6tNvE56PNvwsAFiPVoz4ykDqZNwl8IXO9rk2JQuw+UOAvI7Lq0citaBwHzYaw+eO7qHi9iQHYZLsxgu6SzaOxbp7gmppZ//6PHD7ypxqiRORqW/xlt3N70va4zORdk6M4hMoFZCh33PYUiua01iLMxiBvDGC0pzMtmvRkSlmvZv30zdO/B9l/bBrjhtcAz2l/fabFG6gAlTeprzvv36kItKy2taxcBuQr6NxhtvLW6zF422/MibMsqSIb2KsMdO15DAVm3lMFMQDVUY+7t5rssvV5MVU05Tnnw5cKLTzVC6fVnPlBVJPfnYwPGRyJVZgp4Q7uAdVmitCL/+zxHDbAw5AmRgV4WJ86h5lRRzH41KtncC57Ilbe6BUbIwQF7oowJs67TttF6L7HwQx9b+ns= zroux@zroux-mac" # lucca macos
             ];
           };
         })
diff --git a/nvim/lua/plugins/motions.lua b/nvim/lua/plugins/motions.lua
index f57873a..ca682c0 100644
--- a/nvim/lua/plugins/motions.lua
+++ b/nvim/lua/plugins/motions.lua
@@ -17,6 +17,8 @@ return {
 			{ "agw", "<plug>WordMotion_aw", desc = "a small word (with white-space)", mode = { "x", "o" } },
 		},
 		before = function()
+			-- This never gets applied (ordering issue with wordmotion's autoload)
+			-- This is also set in `settings.lua` but kept here for documentation purposes
 			vim.g.wordmotion_nomap = true
 		end,
 	},
diff --git a/nvim/lua/plugins/noice.lua b/nvim/lua/plugins/noice.lua
index f8c050c..e47ad9e 100644
--- a/nvim/lua/plugins/noice.lua
+++ b/nvim/lua/plugins/noice.lua
@@ -1,6 +1,10 @@
 return {
 	{
 		"noice.nvim",
+		lazy = false,
+		keys = {
+			{ "<leader>zl", "<cmd>Noice<cr>", desc = "List messages" },
+		},
 		opts = {
 			presets = {
 				command_palette = true,
diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua
index 3660c36..7d091e6 100644
--- a/nvim/lua/plugins/ui.lua
+++ b/nvim/lua/plugins/ui.lua
@@ -45,9 +45,18 @@ return {
 
 	{
 		"nvim-pqf",
-		ft = "qf",
 		after = function()
 			require("pqf").setup()
+			vim.api.nvim_create_autocmd("FileType", {
+				pattern = { "qf" },
+				desc = "Set nolist on quickfix",
+				group = vim.api.nvim_create_augroup("qf-nolist", { clear = true }),
+				callback = function()
+					-- or setl nolist
+					vim.opt_local.list = false
+				end,
+			})
+			vim.cmd("autocmd FileType qf setl nolist")
 		end,
 	},
 
diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua
index 236d3ad..028cbd5 100644
--- a/nvim/lua/settings.lua
+++ b/nvim/lua/settings.lua
@@ -39,6 +39,9 @@ vim.opt.listchars = {
 vim.opt.completeopt = { "menuone", "popup", "noinsert", "fuzzy" }
 vim.opt.pumheight = 15
 
+-- Can't specify this in wordmotion's config due to race conditions
+vim.g.wordmotion_nomap = true
+
 -- for all modes except terminal
 vim.keymap.set({ "i", "n", "o", "x", "v", "s", "l", "c" }, "<C-c>", "<esc>")
 -- i don't use terminal that much so not having esc is okay
@@ -50,10 +53,6 @@ vim.g.omni_sql_no_default_maps = 1
 vim.keymap.set("v", "<", "<gv")
 vim.keymap.set("v", ">", ">gv")
 
--- Center screen when navigating search results
-vim.keymap.set("n", "n", "nzzzv", { desc = "Next result" })
-vim.keymap.set("n", "N", "Nzzzv", { desc = "Previous result" })
-
 -- Copy to/from system clipboard
 vim.keymap.set({ "n", "x" }, "<leader>y", '"+y', { desc = "Yank to system clipboard" })
 vim.keymap.set({ "n", "x" }, "<leader>Y", '"+y$', { desc = "Yank line to system clipboard" })
@@ -66,6 +65,9 @@ vim.keymap.set("n", "[q", "<cmd>cprev<cr>zvzz", { desc = "Previous quickfix item
 vim.keymap.set("n", "]q", "<cmd>cnext<cr>zvzz", { desc = "Next quickfix item" })
 vim.keymap.set("n", "[l", "<cmd>lprev<cr>zvzz", { desc = "Previous loclist item" })
 vim.keymap.set("n", "]l", "<cmd>lnext<cr>zvzz", { desc = "Next loclist item" })
+-- Center screen when navigating search results
+vim.keymap.set("n", "n", "nzzzv", { desc = "Next result" })
+vim.keymap.set("n", "N", "Nzzzv", { desc = "Previous result" })
 
 -- Clear snippets with C-l and go to next/prev with C-n & C-p
 vim.keymap.set("n", "<C-l>", function()
@@ -92,6 +94,12 @@ vim.keymap.set({ "i", "s" }, "<C-p>", function()
 end)
 
 
+-- Lsp mapping that should become defaults
+vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, { desc = "Go to definition" })
+vim.keymap.set("n", "gD", function() vim.lsp.buf.declaration() end, { desc = "Go to declaration" })
+vim.keymap.set("n", "gs", function() vim.lsp.buf.type_definition() end, { desc = "Go to type definition" })
+
+
 vim.api.nvim_create_autocmd("TextYankPost", {
 	desc = "Highlight when yanking (copying) text",
 	group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }),
@@ -107,6 +115,7 @@ vim.api.nvim_create_autocmd("BufEnter", {
 	group = vim.api.nvim_create_augroup("comment-ro", { clear = true }),
 	callback = function()
 		vim.opt.formatoptions:remove("ro")
+		vim.opt_local.formatoptions:remove("ro")
 	end,
 })