diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index da88336c..e8dd24f5 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -5,7 +5,7 @@
   "coq.thirdparty": { "branch": "3p", "commit": "ee47eb595100b311ebd81d7285304d58bf28db29" },
   "coq_nvim": { "branch": "coq", "commit": "4c764a092b0a64ad45d69273fde35224cfb89861" },
   "d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" },
-  "diffview.nvim": { "branch": "main", "commit": "6bebefbc4c90e6d2b8c65e65b055d284475d89f8" },
+  "diffview.nvim": { "branch": "main", "commit": "63720aa5a70ce4aa386be407d0e612cd9e63861a" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
   "formatter.nvim": { "branch": "master", "commit": "b09b4573b0b6f4bc9e0ae599f7fab7dab34a6acf" },
   "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" },
@@ -22,16 +22,16 @@
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
   "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" },
   "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "10fa01d553ce10646350461ac5ddc71f189e9d1a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "6fe69025b8825029ea9bf291ab3b1750f9bcb39e" },
   "nvim-treesitter": { "branch": "master", "commit": "ac4020c70722337c326bf65b645b162ee6e1796b" },
   "nvim-treesitter-context": { "branch": "master", "commit": "38203f5e6c62617b3c07662dc71ce3047ecd90d3" },
-  "nvim-web-devicons": { "branch": "master", "commit": "defb7da4d3d313bf31982c52fd78e414f02840c9" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
   "octo.nvim": { "branch": "master", "commit": "f37efab489a99b4a104e5ee18c73453d5e828b62" },
   "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
-  "sonokai": { "branch": "master", "commit": "c995ad5d01712fdd9c7e9529edb035bd5a2c0b0b" },
+  "sonokai": { "branch": "master", "commit": "5eeceab6e905c1b93ba3a49dfbaa1200071990f9" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index 33fc53a8..16711740 100644
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -16,62 +16,61 @@ vim.g.maplocalleader = " "
 local options = { noremap = true, silent = true }
 local normal_mode_maps = {
     -- toggles
-    { key = '<F2>', map = [[<cmd>set number! relativenumber!<cr>]] },
+    { key = '<F2>',       map = [[<cmd>set number! relativenumber!<cr>]] },
 
     -- dap
-    { key = '<F5>', map = [[<cmd>lua require'dap'.continue()<cr>]] },
-    { key = '<F10>', map = [[<cmd>lua require'dap'.step_over()<cr>]] },
-    { key = '<F11>', map = [[<cmd>lua require'dap'.step_into()<cr>]] },
-    { key = '<F12>', map = [[<cmd>lua require'dap'.step_out()<cr>]] },
+    { key = '<F5>',       map = [[<cmd>lua require'dap'.continue()<cr>]] },
+    { key = '<F10>',      map = [[<cmd>lua require'dap'.step_over()<cr>]] },
+    { key = '<F11>',      map = [[<cmd>lua require'dap'.step_into()<cr>]] },
+    { key = '<F12>',      map = [[<cmd>lua require'dap'.step_out()<cr>]] },
     { key = '<Leader>bb', map = [[<cmd>lua require'dap'.toggle_breakpoint()<cr>]] },
-    { key = '<Leader>B', map = [[<cmd>lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<cr>]] },
+    { key = '<Leader>B',  map = [[<cmd>lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<cr>]] },
     { key = '<Leader>lp',
         map = [[<cmd>lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<cr>]] },
-    { key = '<Leader>dr', map = [[<cmd>lua require'dap'.repl.open()<cr>]] },
-    { key = '<Leader>dl', map = [[<cmd>lua require'dap'.run_last()<cr>]] },
+    { key = '<Leader>dr',       map = [[<cmd>lua require'dap'.repl.open()<cr>]] },
+    { key = '<Leader>dl',       map = [[<cmd>lua require'dap'.run_last()<cr>]] },
 
     -- navigation
     { key = '<leader><leader>', map = [[<c-^>]] },
-    { key = '<leader>n', map = [[<cmd>bnext<cr>]] },
-    { key = '<leader>p', map = [[<cmd>bprev<cr>]] },
-    { key = '<leader>q', map = [[<cmd>bw<cr>]] },
-    { key = '<leader>v', map = [[<cmd>CHADopen<cr>]] },
+    { key = '<leader>n',        map = [[<cmd>bnext<cr>]] },
+    { key = '<leader>p',        map = [[<cmd>bprev<cr>]] },
+    { key = '<leader>q',        map = [[<cmd>bw<cr>]] },
+    { key = '<leader>v',        map = [[<cmd>CHADopen<cr>]] },
 
     -- " Find files using Telescope command-line sugar.
-    { key = '<leader>ff', map = [[<cmd>lua require('telescope.builtin').find_files()<cr>]] },
-    { key = '<leader>gg', map = [[<cmd>lua require('telescope.builtin').live_grep()<cr>]] },
-    { key = '<leader>;', map = [[<cmd>lua require('telescope.builtin').buffers()<cr>]] },
-    { key = '<leader>fh', map = [[<cmd>lua require('telescope.builtin').help_tags()<cr>]] },
-    { key = '<leader>gB', map = [[<cmd>Git blame<cr>]] },
-
-    { key = '<leader>rd', map = [[<cmd>RustDebuggables<cr>]] },
-    { key = '<leader>rr', map = [[<cmd>RustRunnables<cr>]] },
-    { key = 'vff', map = [[<cmd>vertical Gdiffsplit<cr>]] },
-    { key = 'vff!', map = [[<cmd>vertical Gdiffsplit!<cr>]] },
-    { key = 'ssr', map = [[<cmd>lua require'rust-tools'.ssr.ssr(query)<cr>]] },
+    { key = '<leader>ff',       map = [[<cmd>lua require('telescope.builtin').find_files()<cr>]] },
+    { key = '<leader>gg',       map = [[<cmd>lua require('telescope.builtin').live_grep()<cr>]] },
+    { key = '<leader>;',        map = [[<cmd>lua require('telescope.builtin').buffers()<cr>]] },
+    { key = '<leader>fh',       map = [[<cmd>lua require('telescope.builtin').help_tags()<cr>]] },
+    { key = '<leader>gB',       map = [[<cmd>Git blame<cr>]] },
+    { key = '<leader>rd',       map = [[<cmd>RustDebuggables<cr>]] },
+    { key = '<leader>rr',       map = [[<cmd>RustRunnables<cr>]] },
+    { key = 'vff',              map = [[<cmd>vertical Gdiffsplit<cr>]] },
+    { key = 'vff!',             map = [[<cmd>vertical Gdiffsplit!<cr>]] },
+    { key = 'ssr',              map = [[<cmd>lua require'rust-tools'.ssr.ssr(query)<cr>]] },
+    { key = '<C-\\>',            map = [[<cmd>ToggleTerm<cr>]] },
 
     -- Session
-    { key = '<leader>ss', map = [[<cmd>SessionSave<cr>]] },
-    { key = '<leader>sl', map = [[<cmd>SessionLoad<cr>]] },
+    { key = '<leader>ss',       map = [[<cmd>SessionSave<cr>]] },
+    { key = '<leader>sl',       map = [[<cmd>SessionLoad<cr>]] },
 
     -- lsp
-    { key = 'K', map = [[<cmd>lua vim.lsp.buf.hover()<cr>]] },
-    { key = '<C-k>', map = [[<cmd>lua vim.lsp.buf.definition()<cr>]] },
-    { key = 'gi', map = [[<cmd>lua vim.lsp.buf.implementation()<cr>]] },
-    { key = '<leader>o', map = [[<cmd>TroubleToggle<cr>]] },
-    { key = '<leader>dd', map = [[<cmd>lua require'dapui'.toggle()<cr>]] },
+    { key = 'K',                map = [[<cmd>lua vim.lsp.buf.hover()<cr>]] },
+    { key = '<C-k>',            map = [[<cmd>lua vim.lsp.buf.definition()<cr>]] },
+    { key = 'gi',               map = [[<cmd>lua vim.lsp.buf.implementation()<cr>]] },
+    { key = '<leader>o',        map = [[<cmd>TroubleToggle<cr>]] },
+    { key = '<leader>dd',       map = [[<cmd>lua require'dapui'.toggle()<cr>]] },
 
     -- { key = '<leader>a', map = [[<cmd>lua vim.lsp.buf.document_highlight()<cr>]] },
     -- { key = '<leader>c', map = [[<cmd>lua vim.lsp.buf.clear_references()<cr>]] },
-    { key = '<leader>"', map = [["+]] },
-    { key = 'F', map = [[<cmd>lua vim.lsp.buf.format { async = true }<cr>]] },
-    { key = 'T', map = [[<cmd>lua require'lsp_extensions'.inlay_hints()<cr>]] },
-
-    { key = '<C-W>%', map = [[<cmd>vsplit<cr>]] },
-    { key = '<C-l>', map = [[<cmd>:SymbolsOutline<cr>]] },
+    { key = '<leader>"',        map = [["+]] },
+    { key = 'F',                map = [[<cmd>lua vim.lsp.buf.format { async = true }<cr>]] },
+    { key = 'T',                map = [[<cmd>lua require'lsp_extensions'.inlay_hints()<cr>]] },
+    { key = '<C-W>%',           map = [[<cmd>vsplit<cr>]] },
+    { key = '<C-l>',            map = [[<cmd>:SymbolsOutline<cr>]] },
 
     -- Other
-    { key = '<leader>m', map = [[<cmd>silent !mpcfzf<cr>]] },
+    { key = '<leader>m',        map = [[<cmd>silent !mpcfzf<cr>]] },
     { key = '<leader>l',
         map = [[<cmd>lua require('telescope.builtin').lsp_references({include_current_line = true, fname_width = 40})<cr>]] },
     { key = '<leader>i',
@@ -88,8 +87,8 @@ local normal_mode_maps = {
 
 local insert_mode_maps = {
     { key = '<C-j>', map = '<ESC>' },
-    { key = "<C-l>", map = 'copilot#Accept("<CR>")', options = { silent = true, expr = true } },
-    { key = "<C-m>", map = 'copilot#Accept("<CR>")', options = { silent = true, expr = true } },
+    { key = "<C-l>", map = 'copilot#Accept("<CR>")',       options = { silent = true, expr = true } },
+    { key = "<C-m>", map = 'copilot#Accept("<CR>")',       options = { silent = true, expr = true } },
     { key = '<C-c>', map = [[<cmd>Telescope commands<cr>]] },
 }