diff --git a/home.nix b/home.nix
index f3b96c9..5c5974d 100644
--- a/home.nix
+++ b/home.nix
@@ -28,12 +28,13 @@ in
     (nerdfonts.override { fonts = [ "Meslo" ]; })
     bashInteractive
     google-cloud-sdk
-    imagemagick
     htop
+    imagemagick
     k9s
     kubectl
     mosh
     neofetch
+    pre-commit
     python311
     tldr
   ] ++ optionals isDarwin [
diff --git a/nvim/config/lua/base.lua b/nvim/config/lua/base.lua
index 56e3d65..3f2963a 100644
--- a/nvim/config/lua/base.lua
+++ b/nvim/config/lua/base.lua
@@ -2,8 +2,6 @@
 vim.g.nord_borders = true
 vim.g.nord_contrast = true
 vim.cmd('colorscheme nord')
--- vim.cmd('colorscheme embark')
--- vim.cmd('colorscheme gruvbox-material')
 
 -- Set Leader
 vim.keymap.set("n", "<Space>", "<Nop>", {silent = true})
@@ -36,16 +34,32 @@ vim.opt.foldmethod = "indent"
 vim.opt.foldnestmax = 10
 vim.opt.foldlevel = 2
 
--- Set Color Scheme
--- vim.cmd('colorscheme embark')
--- vim.cmd('colorscheme OceanicNext')
--- vim.cmd('colorscheme material')
--- vim.g.material_style = "oceanic"
+-- Diagnostics Mappings
+local diagnostics_active = true
+local toggle_diagnostics = function()
+    diagnostics_active = not diagnostics_active
+    if diagnostics_active then
+        vim.diagnostic.show()
+    else
+        vim.diagnostic.hide()
+    end
+end
+
+local diagnostics_loclist_active = false
+local toggle_diagnostics_loclist = function()
+    diagnostics_loclist_active = not diagnostics_loclist_active
+    if diagnostics_loclist_active then
+        vim.diagnostic.setloclist()
+    else
+        vim.cmd('lclose')
+    end
+end
 
--- Mappings.
--- See `:help vim.diagnostic.*` for documentation on any of the below functions
 local opts = {noremap = true, silent = true}
-vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
-vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
+vim.keymap.set('n', '<leader>qt', toggle_diagnostics, opts)
+vim.keymap.set('n', '<leader>qN',
+               function() vim.diagnostic.goto_prev({float = false}) end, opts)
+vim.keymap.set('n', '<leader>qn',
+               function() vim.diagnostic.goto_next({float = false}) end, opts)
+vim.keymap.set('n', '<leader>qq', toggle_diagnostics_loclist, opts)
+vim.keymap.set('n', '<leader>qe', vim.diagnostic.open_float, opts)
diff --git a/nvim/config/lua/which-key-config.lua b/nvim/config/lua/which-key-config.lua
index 2d400ff..ccdb335 100644
--- a/nvim/config/lua/which-key-config.lua
+++ b/nvim/config/lua/which-key-config.lua
@@ -6,8 +6,14 @@ wk.register({
     K = {"Definition Hover"},
     ["<C-k>"] = {"Signature Help"},
     ["<leader>"] = {
-        q = {"Show Diagnostics"},
-        e = {"Show Line Diagnostics"},
+        q = {
+            name = "Diagnostics",
+            q = {"Toggle Diagnostic List"},
+            t = {"Toggle Inline Diagnostics"},
+            n = {"Next Diagnostic"},
+            N = {"Previous Diagnostic"},
+            e = {"Open Diagnostic Float"}
+        },
         d = {
             name = "DiffView",
             o = {"<cmd>DiffviewOpen<cr>", "Open Diff"},