diff --git a/config/neovim/config.lua b/config/neovim/config.lua
index 17295f99..97c66543 100644
--- a/config/neovim/config.lua
+++ b/config/neovim/config.lua
@@ -125,7 +125,7 @@ require("lazy").setup({
             event = { "InsertEnter" },
             lazy = true,
             name = "better_escape",
-            opts = { mapping = { "jk" }, timeout = 200 },
+            opts = { default_mappings = true, timeout = 200 },
         },
         {
             "clangd_extensions",
@@ -1178,9 +1178,18 @@ require("lazy").setup({
             config = function(_, opts)
                 require("which-key").setup(opts)
             end,
+            dependencies = {
+                {
+                    "mini",
+                    dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/mini.nvim",
+                    lazy = true,
+                    name = "mini",
+                },
+            },
             dir = "/home/lab/smchurla/Downloads/flake-nixinator/config/neovim/store/lazy-plugins/which-key.nvim",
             lazy = false,
             name = "which-key",
+            opts = { preset = "modern" },
             priority = 500,
         },
         {
diff --git a/config/neovim/config_nix.lua b/config/neovim/config_nix.lua
index 4273b812..4eaacb6a 100644
--- a/config/neovim/config_nix.lua
+++ b/config/neovim/config_nix.lua
@@ -68,7 +68,7 @@ end
 vim.loader.enable()
 require("lazy").setup({
     dev = {
-        path = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins",
+        path = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins",
         patterns = { "." },
         fallback = false,
     },
@@ -83,7 +83,7 @@ require("lazy").setup({
     colorscheme catppuccin
   ]])
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/catppuccin-nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/catppuccin-nvim",
             lazy = false,
             name = "catppuccin",
             opts = { background = { dark = "mocha", light = "latte" }, flavour = "mocha" },
@@ -94,7 +94,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("nvim-web-devicons").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-web-devicons",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-web-devicons",
             lazy = true,
             name = "nvim-web-devicons",
         },
@@ -103,7 +103,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("nvim-autopairs").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-autopairs",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-autopairs",
             event = { "InsertEnter" },
             lazy = true,
             name = "nvim-autopairs",
@@ -112,7 +112,7 @@ require("lazy").setup({
         {
             "vim-bbye",
             cmd = { "Bdelete", "Bwipeout" },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-bbye",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-bbye",
             lazy = true,
             name = "vim-bbye",
         },
@@ -121,18 +121,18 @@ require("lazy").setup({
             config = function(_, opts)
                 require("better_escape").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/better-escape.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/better-escape.nvim",
             event = { "InsertEnter" },
             lazy = true,
             name = "better_escape",
-            opts = { mapping = { "jk" }, timeout = 200 },
+            opts = { default_mappings = true, timeout = 200 },
         },
         {
             "clangd_extensions",
             config = function(_, opts)
                 require("clangd_extensions").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/clangd_extensions.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/clangd_extensions.nvim",
             lazy = true,
             name = "clangd_extensions",
             opts = { inlay_hints = { inline = false } },
@@ -145,50 +145,50 @@ require("lazy").setup({
             dependencies = {
                 {
                     "cmp-async-path",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-async-path",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-async-path",
                     lazy = true,
                     name = "cmp-async-path",
                 },
                 {
                     "cmp-buffer",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-buffer",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-buffer",
                     enabled = false,
                     lazy = true,
                     name = "cmp-buffer",
                 },
                 {
                     "cmp-cmdline",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-cmdline",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-cmdline",
                     enabled = false,
                     lazy = true,
                     name = "cmp-cmdline",
                 },
                 {
                     "cmp-emoji",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-emoji",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-emoji",
                     lazy = true,
                     name = "cmp-emoji",
                 },
                 {
                     "cmp-nvim-lsp",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-nvim-lsp",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-nvim-lsp",
                     lazy = true,
                     name = "cmp-nvim-lsp",
                 },
                 {
                     "cmp-nvim-lsp-signature-help",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp-nvim-lsp-signature-help",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp-nvim-lsp-signature-help",
                     lazy = true,
                     name = "cmp-nvim-lsp-signature-help",
                 },
                 {
                     "cmp_luasnip",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/cmp_luasnip",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/cmp_luasnip",
                     lazy = true,
                     name = "cmp_luasnip",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-cmp",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-cmp",
             event = { "InsertEnter" },
             lazy = true,
             name = "cmp",
@@ -269,7 +269,7 @@ require("lazy").setup({
                     config = function(_, opts)
                         require("ts_context_commentstring").setup(opts)
                     end,
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-ts-context-commentstring",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-ts-context-commentstring",
                     init = function()
                         -- Skip compatibility checks
                         vim.g.skip_ts_context_commentstring_module = true
@@ -278,7 +278,7 @@ require("lazy").setup({
                     name = "ts_context_commentstring",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/comment.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/comment.nvim",
             lazy = false,
             name = "Comment",
             opts = {
@@ -295,7 +295,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("conform").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/conform.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/conform.nvim",
             event = { "BufReadPost", "BufNewFile" },
             lazy = true,
             name = "conform",
@@ -335,7 +335,7 @@ require("lazy").setup({
                     config = function(_, opts)
                         require("nvim-web-devicons").setup(opts)
                     end,
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-web-devicons",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-web-devicons",
                     lazy = true,
                     name = "nvim-web-devicons",
                 },
@@ -362,30 +362,30 @@ require("lazy").setup({
                             dependencies = {
                                 {
                                     "plenary",
-                                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim",
+                                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
                                     lazy = true,
                                     name = "plenary",
                                 },
                                 {
                                     "telescope-fzf-native",
-                                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-fzf-native.nvim",
+                                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-fzf-native.nvim",
                                     lazy = true,
                                     name = "telescope-fzf-native",
                                 },
                                 {
                                     "telescope-undo",
-                                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-undo.nvim",
+                                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-undo.nvim",
                                     lazy = true,
                                     name = "telescope-undo",
                                 },
                                 {
                                     "telescope-ui-select",
-                                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-ui-select.nvim",
+                                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-ui-select.nvim",
                                     lazy = true,
                                     name = "telescope-ui-select",
                                 },
                             },
-                            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope.nvim",
+                            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope.nvim",
                             lazy = true,
                             name = "telescope",
                             opts = {
@@ -401,7 +401,7 @@ require("lazy").setup({
                             },
                         },
                     },
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/persisted.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/persisted.nvim",
                     lazy = true,
                     name = "persisted",
                     opts = {
@@ -414,7 +414,7 @@ require("lazy").setup({
                     },
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/dashboard-nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/dashboard-nvim",
             lazy = false,
             name = "dashboard",
             opts = {
@@ -444,13 +444,13 @@ require("lazy").setup({
         {
             "diffview",
             cmd = { "DiffviewOpen" },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/diffview.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/diffview.nvim",
             lazy = true,
             name = "diffview",
         },
         {
             "direnv",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/direnv.vim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/direnv.vim",
             lazy = false,
             name = "direnv",
         },
@@ -459,7 +459,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("flash").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/flash.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/flash.nvim",
             keys = { "s", "S", "f", "F", "t", "T" },
             lazy = true,
             name = "flash",
@@ -467,7 +467,7 @@ require("lazy").setup({
         {
             "gitmessenger",
             cmd = { "GitMessenger" },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/git-messenger.vim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/git-messenger.vim",
             init = function()
                 for k, v in pairs({
                     ["git_messenger_floating_win_opts"] = { ["border"] = "rounded" },
@@ -484,7 +484,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("gitsigns").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/gitsigns.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/gitsigns.nvim",
             event = { "BufReadPost", "BufNewFile" },
             lazy = true,
             name = "gitsigns",
@@ -492,7 +492,7 @@ require("lazy").setup({
         },
         {
             "haskell-tools",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/haskell-tools.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/haskell-tools.nvim",
             lazy = false,
             name = "haskell-tools",
         },
@@ -501,7 +501,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("illuminate").configure(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-illuminate",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-illuminate",
             event = { "BufreadPost", "BufNewFile" },
             lazy = true,
             name = "illuminate",
@@ -521,14 +521,14 @@ require("lazy").setup({
         },
         {
             "intellitab",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/intellitab.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/intellitab.nvim",
             event = { "InsertEnter" },
             lazy = true,
             name = "intellitab",
         },
         {
             "jdtls",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-jdtls",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-jdtls",
             lazy = false,
             name = "jdtls",
         },
@@ -537,7 +537,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("nvim-lastplace").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-lastplace",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-lastplace",
             lazy = false,
             name = "nvim-lastplace",
         },
@@ -547,12 +547,12 @@ require("lazy").setup({
             dependencies = {
                 {
                     "plenary",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
                     lazy = true,
                     name = "plenary",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/lazygit.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/lazygit.nvim",
             lazy = true,
             name = "lazygit",
         },
@@ -565,7 +565,7 @@ require("lazy").setup({
                     lint[k] = v
                 end
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-lint",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-lint",
             event = { "BufReadPost", "BufNewFile" },
             lazy = true,
             name = "lint",
@@ -679,12 +679,12 @@ require("lazy").setup({
                     config = function(_, opts)
                         require("lazydev").setup(opts)
                     end,
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vimplugin-nvim-lazydev",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vimplugin-nvim-lazydev",
                     ft = { "lua" },
                     name = "lazydev",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-lspconfig",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-lspconfig",
             event = { "BufReadPost", "BufNewFile" },
             lazy = true,
             name = "lspconfig",
@@ -702,7 +702,7 @@ require("lazy").setup({
                     unhide = false,
                 })
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/lualine.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/lualine.nvim",
             event = { "BufReadPost", "BufNewFile" },
             lazy = true,
             name = "lualine",
@@ -730,7 +730,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("luasnip").config.set_config(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/luasnip",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/luasnip",
             lazy = false,
             name = "luasnip",
         },
@@ -742,7 +742,7 @@ require("lazy").setup({
                 vim.keymap.del("x", "<space>nr")
                 vim.keymap.del("n", "<space>nr")
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/NrrwRgn",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/NrrwRgn",
             lazy = true,
             name = "narrow-region",
         },
@@ -779,13 +779,13 @@ require("lazy").setup({
                         --   }
                         -- })
                     end,
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-navic",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-navic",
                     lazy = true,
                     name = "navic",
                     opts = { click = true, depth_limit = 5, highlight = true, lsp = { auto_attach = true } },
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-navbuddy",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-navbuddy",
             lazy = true,
             name = "navbuddy",
             opts = { lsp = { auto_attach = true }, window = { border = "rounded" } },
@@ -799,7 +799,7 @@ require("lazy").setup({
             dependencies = {
                 {
                     "plenary",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
                     lazy = true,
                     name = "plenary",
                 },
@@ -808,18 +808,18 @@ require("lazy").setup({
                     config = function(_, opts)
                         require("nvim-web-devicons").setup(opts)
                     end,
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-web-devicons",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-web-devicons",
                     lazy = true,
                     name = "nvim-web-devicons",
                 },
                 {
                     "nui",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nui.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nui.nvim",
                     lazy = true,
                     name = "nui",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/neo-tree.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/neo-tree.nvim",
             lazy = true,
             name = "neo-tree",
             opts = {
@@ -874,18 +874,18 @@ require("lazy").setup({
                         notify.setup(opts)
                         vim.notify = notify -- Vim uses notify by default
                     end,
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-notify",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-notify",
                     lazy = true,
                     name = "notify",
                 },
                 {
                     "nui",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nui.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nui.nvim",
                     lazy = true,
                     name = "nui",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/noice.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/noice.nvim",
             lazy = false,
             name = "noice",
             opts = {
@@ -921,13 +921,13 @@ require("lazy").setup({
         },
         {
             "rainbow-delimiters",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/rainbow-delimiters.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/rainbow-delimiters.nvim",
             lazy = false,
             name = "rainbow-delimiters",
         },
         {
             "rustaceanvim",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/rustaceanvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/rustaceanvim",
             init = function()
                 vim.g.rustaceanvim = {
                     tools = {
@@ -973,7 +973,7 @@ require("lazy").setup({
         },
         {
             "sandwich",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-sandwich",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-sandwich",
             init = function()
                 -- Disable default keymaps
                 vim.g.sandwich_no_default_key_mappings = 1
@@ -985,7 +985,7 @@ require("lazy").setup({
         },
         {
             "sleuth",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vim-sleuth",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vim-sleuth",
             lazy = false,
             name = "sleuth",
         },
@@ -1003,30 +1003,30 @@ require("lazy").setup({
             dependencies = {
                 {
                     "plenary",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
                     lazy = true,
                     name = "plenary",
                 },
                 {
                     "telescope-fzf-native",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-fzf-native.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-fzf-native.nvim",
                     lazy = true,
                     name = "telescope-fzf-native",
                 },
                 {
                     "telescope-undo",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-undo.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-undo.nvim",
                     lazy = true,
                     name = "telescope-undo",
                 },
                 {
                     "telescope-ui-select",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope-ui-select.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope-ui-select.nvim",
                     lazy = true,
                     name = "telescope-ui-select",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/telescope.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/telescope.nvim",
             lazy = true,
             name = "telescope",
             opts = {
@@ -1047,12 +1047,12 @@ require("lazy").setup({
             dependencies = {
                 {
                     "plenary",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/plenary.nvim",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/plenary.nvim",
                     lazy = true,
                     name = "plenary",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/todo-comments.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/todo-comments.nvim",
             event = { "BufReadPost", "BufNewFile" },
             lazy = true,
             name = "todo-comments",
@@ -1075,7 +1075,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("toggleterm").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/toggleterm.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/toggleterm.nvim",
             keys = { "<C-/>" },
             lazy = true,
             name = "toggleterm",
@@ -1102,7 +1102,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("nvim-treesitter.configs").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-treesitter",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-treesitter",
             event = { "BufReadPost", "BufNewFile" },
             init = function()
                 -- Fix treesitter grammars/parsers on nix
@@ -1134,7 +1134,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("trim").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/trim.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/trim.nvim",
             lazy = false,
             name = "trim",
         },
@@ -1144,7 +1144,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("trouble").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/trouble.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/trouble.nvim",
             lazy = true,
             name = "trouble",
         },
@@ -1156,18 +1156,18 @@ require("lazy").setup({
             dependencies = {
                 {
                     "promise",
-                    dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/promise-async",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/promise-async",
                     lazy = true,
                     name = "promise",
                 },
             },
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/nvim-ufo",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/nvim-ufo",
             lazy = false,
             name = "ufo",
         },
         {
             "vimtex",
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/vimtex",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/vimtex",
             init = function()
                 vim.g.vimtex_view_method = "zathura"
             end,
@@ -1178,9 +1178,18 @@ require("lazy").setup({
             config = function(_, opts)
                 require("which-key").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/which-key.nvim",
+            dependencies = {
+                {
+                    "mini",
+                    dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/mini.nvim",
+                    lazy = true,
+                    name = "mini",
+                },
+            },
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/which-key.nvim",
             lazy = false,
             name = "which-key",
+            opts = { preset = "modern" },
             priority = 500,
         },
         {
@@ -1189,7 +1198,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("winshift").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/winshift.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/winshift.nvim",
             lazy = true,
             name = "winshift",
             opts = {
@@ -1203,7 +1212,7 @@ require("lazy").setup({
             config = function(_, opts)
                 require("yanky").setup(opts)
             end,
-            dir = "/nix/store/p9vf3cclb3px64da4qsk7lfs3140sjbp-lazy-plugins/yanky.nvim",
+            dir = "/nix/store/ypd5dagzrwpz35gnf0a67ak6lz7drfpi-lazy-plugins/yanky.nvim",
             lazy = true,
             name = "yanky",
         },