diff --git a/.config/nvim/lua/lilJ/health.lua b/.config/nvim/lua/lilJ/health.lua
index e1d6041..13bfbaa 100644
--- a/.config/nvim/lua/lilJ/health.lua
+++ b/.config/nvim/lua/lilJ/health.lua
@@ -6,47 +6,47 @@
 --]]
 
 local check_version = function()
-	local verstr = string.format("%s.%s.%s", vim.version().major, vim.version().minor, vim.version().patch)
-	if not vim.version.cmp then
-		vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
-		return
-	end
+    local verstr = string.format("%s.%s.%s", vim.version().major, vim.version().minor, vim.version().patch)
+    if not vim.version.cmp then
+        vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
+        return
+    end
 
-	if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
-		vim.health.ok(string.format("Neovim version is: '%s'", verstr))
-	else
-		vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
-	end
+    if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
+        vim.health.ok(string.format("Neovim version is: '%s'", verstr))
+    else
+        vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
+    end
 end
 
 local check_external_reqs = function()
-	-- Basic utils: `git`, `make`, `unzip`
-	for _, exe in ipairs({ "git", "make", "unzip", "rg" }) do
-		local is_executable = vim.fn.executable(exe) == 1
-		if is_executable then
-			vim.health.ok(string.format("Found executable: '%s'", exe))
-		else
-			vim.health.warn(string.format("Could not find executable: '%s'", exe))
-		end
-	end
+    -- Basic utils: `git`, `make`, `unzip`
+    for _, exe in ipairs { "git", "make", "unzip", "rg" } do
+        local is_executable = vim.fn.executable(exe) == 1
+        if is_executable then
+            vim.health.ok(string.format("Found executable: '%s'", exe))
+        else
+            vim.health.warn(string.format("Could not find executable: '%s'", exe))
+        end
+    end
 
-	return true
+    return true
 end
 
 return {
-	check = function()
-		vim.health.start("kickstart.nvim")
+    check = function()
+        vim.health.start "kickstart.nvim"
 
-		vim.health.info([[NOTE: Not every warning is a 'must-fix' in `:checkhealth`
+        vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth`
 
   Fix only warnings for plugins and languages you intend to use.
     Mason will give warnings for languages that are not installed.
-    You do not need to install, unless you want to use those languages!]])
+    You do not need to install, unless you want to use those languages!]]
 
-		local uv = vim.uv or vim.loop
-		vim.health.info("System Information: " .. vim.inspect(uv.os_uname()))
+        local uv = vim.uv or vim.loop
+        vim.health.info("System Information: " .. vim.inspect(uv.os_uname()))
 
-		check_version()
-		check_external_reqs()
-	end,
+        check_version()
+        check_external_reqs()
+    end,
 }
diff --git a/.config/nvim/plugin/keymaps.lua b/.config/nvim/plugin/keymaps.lua
index 5412fbb..772edae 100644
--- a/.config/nvim/plugin/keymaps.lua
+++ b/.config/nvim/plugin/keymaps.lua
@@ -34,8 +34,14 @@ vim.opt.hlsearch = true
 set("n", "<Esc>", "<cmd>nohlsearch<CR>")
 
 -- Diagnostic keymaps
-set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous [D]iagnostic message" })
-set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next [D]iagnostic message" })
+set("n", "[d", function()
+    vim.diagnostic.jump { count = -1, float = true }
+end, { desc = "Go to previous [D]iagnostic message" })
+
+set("n", "]d", function()
+    vim.diagnostic.jump { count = 1, float = true }
+end, { desc = "Go to next [D]iagnostic message" })
+
 set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagnostic [Q]uickfix list" })
 set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Show diagnostic [E]rror messages" })