diff --git a/nvim/init.lua b/nvim/init.lua
index 215be02..919b12b 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -21,8 +21,8 @@ if not LAZY_OPTS then
       rtp = {
         reset = false,
         disabled_plugins = {
-          "netrwPlugin",
-          "tutor",
+          'netrwPlugin',
+          'tutor',
         },
       },
     },
diff --git a/nvim/lua/config/init.lua b/nvim/lua/config/init.lua
index e3a42c9..daaaa59 100644
--- a/nvim/lua/config/init.lua
+++ b/nvim/lua/config/init.lua
@@ -21,7 +21,7 @@ vim.opt.winborder = 'single'
 
 -- Switch tab length on the fly
 vim.keymap.set('n', '\\t', function()
-  vim.o.tabstop = vim.o.tabstop == 2 and 4 or 2
+  vim.o.tabstop = vim.o.tabstop == 8 and 2 or 2 * vim.o.tabstop
 end, { silent = true, desc = 'toggle tabstop' })
 
 -- autocmd
@@ -45,9 +45,7 @@ vim.api.nvim_create_autocmd('BufWinEnter', {
 
 -- Configure Neovim diagnostic messages
 vim.diagnostic.config {
-  virtual_text = {
-    current_line = true,
-  },
+  virtual_text = true,
   underline = true,
   severity_sort = true,
   float = {
@@ -58,28 +56,28 @@ vim.diagnostic.config {
 }
 
 -- random keymaps
-vim.keymap.set({ 'v', 'i', }, 'wq', '<esc>l', { noremap = true, silent = true })
+vim.keymap.set({ 'v', 'i' }, 'wq', '<esc>l', { noremap = true, silent = true })
 vim.keymap.set('n', '<S-l>', vim.cmd.bnext, { noremap = true, silent = true })
 vim.keymap.set('n', '<S-h>', vim.cmd.bprev, { noremap = true, silent = true })
-vim.keymap.set('v', "<", "<gv")
-vim.keymap.set('v', ">", ">gv")
+vim.keymap.set('v', '<', '<gv')
+vim.keymap.set('v', '>', '>gv')
 
 -- resize splits if window got resized
-vim.api.nvim_create_autocmd({ "VimResized" }, {
-  group = vim.api.nvim_create_augroup("resize_splits", { clear = true }),
+vim.api.nvim_create_autocmd({ 'VimResized' }, {
+  group = vim.api.nvim_create_augroup('resize_splits', { clear = true }),
   callback = function()
     local current_tab = vim.fn.tabpagenr()
-    vim.cmd("tabdo wincmd =")
-    vim.cmd("tabnext " .. current_tab)
+    vim.cmd('tabdo wincmd =')
+    vim.cmd('tabnext ' .. current_tab)
   end,
 })
 
 -- Check if we need to reload the file when it changed
-vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
-  group = vim.api.nvim_create_augroup("check_reload", { clear = true }),
+vim.api.nvim_create_autocmd({ 'FocusGained', 'TermClose', 'TermLeave' }, {
+  group = vim.api.nvim_create_augroup('check_reload', { clear = true }),
   callback = function()
-    if vim.o.buftype ~= "nofile" then
-      vim.cmd("checktime")
+    if vim.o.buftype ~= 'nofile' then
+      vim.cmd('checktime')
     end
   end,
 })
diff --git a/nvim/lua/plugins/ai.lua b/nvim/lua/plugins/ai.lua
index 670f55e..201beb1 100644
--- a/nvim/lua/plugins/ai.lua
+++ b/nvim/lua/plugins/ai.lua
@@ -1,17 +1,17 @@
 return {
   {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
+    'zbirenbaum/copilot.lua',
+    cmd = 'Copilot',
     opts = {
       panel = {
         enabled = true,
         auto_refresh = false,
         keymap = {
-          jump_prev = "<C-p>",
-          jump_next = "<C-n>",
-          accept = "<C-y>",
-          toggle = "<M-CR>"
-        }
+          jump_prev = '<C-p>',
+          jump_next = '<C-n>',
+          accept = '<C-y>',
+          toggle = '<M-CR>',
+        },
       },
       suggestion = {
         enabled = false,
@@ -24,12 +24,12 @@ return {
           selection = {
             preselect = false,
             auto_insert = true,
-          }
+          },
         },
         accept = {
           auto_brackets = {
-            enabled = true
-          }
+            enabled = true,
+          },
         },
       },
       filetypes = {
@@ -44,22 +44,22 @@ return {
         puppet = true,
         yaml = true,
         markdown = true,
-        ["*"] = false,
-      }
-    }
+        ['*'] = false,
+      },
+    },
   },
   {
-    "olimorris/codecompanion.nvim",
-    cmd = "Copilot",
+    'olimorris/codecompanion.nvim',
+    cmd = 'Copilot',
     dependencies = {
-      "nvim-lua/plenary.nvim",
-      "nvim-treesitter/nvim-treesitter",
-      "zbirenbaum/copilot.lua",
+      'nvim-lua/plenary.nvim',
+      'nvim-treesitter/nvim-treesitter',
+      'zbirenbaum/copilot.lua',
     },
     opts = {
       strategies = {
-        chat = { adapter = "copilot", },
-        inline = { adapter = "copilot", },
+        chat = { adapter = 'copilot' },
+        inline = { adapter = 'copilot' },
       },
     },
     keys = {
@@ -67,23 +67,22 @@ return {
         '<leader>ac',
         '<cmd>CodeCompanionChat Toggle<CR>',
         noremap = true,
-        desc = 'Copilot chat toggle'
+        desc = 'Copilot chat toggle',
       },
       {
         '<leader>as',
         '<cmd>CodeCompanionChat Add<CR>',
         noremap = true,
-        mode = { "n", "v" },
-        desc = 'Copilot chat add selection'
+        mode = { 'n', 'v' },
+        desc = 'Copilot chat add selection',
       },
       {
         '<leader>aa',
         '<cmd>CodeCompanionActions<CR>',
         noremap = true,
-        mode = { "n", "v" },
-        desc = 'Copilot inline'
-      }
-    }
-
+        mode = { 'n', 'v' },
+        desc = 'Copilot inline',
+      },
+    },
   },
 }
diff --git a/nvim/lua/plugins/completion.lua b/nvim/lua/plugins/completion.lua
index b0b5d40..c855bfc 100644
--- a/nvim/lua/plugins/completion.lua
+++ b/nvim/lua/plugins/completion.lua
@@ -33,7 +33,7 @@ return {
               auto_refresh = {
                 backward = false,
                 forward = true,
-              }
+              },
             },
           },
         },
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 0970bca..54288fe 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -9,7 +9,7 @@ return {
       win = {
         size = 0.25,
         position = 'right',
-        type = 'split'
+        type = 'split',
       },
     },
     keys = {
@@ -17,15 +17,15 @@ return {
         'gre',
         '<cmd>Trouble diagnostics toggle<CR>',
         noremap = true,
-        desc = 'Trouble diagnostics'
+        desc = 'Trouble diagnostics',
       },
       {
         '<leader>nt',
         '<cmd>Trouble qflist<CR>',
         noremap = true,
-        desc = 'Trouble qflist'
-      }
-    }
+        desc = 'Trouble qflist',
+      },
+    },
   },
   {
     'neovim/nvim-lspconfig',
@@ -40,7 +40,7 @@ return {
       local capabilities = vim.tbl_deep_extend(
         'force',
         {},
-        require("blink.cmp").get_lsp_capabilities(),
+        require('blink.cmp').get_lsp_capabilities(),
         vim.lsp.protocol.make_client_capabilities()
       )
       lspconfig.gopls.setup {
@@ -121,13 +121,13 @@ return {
           vim.keymap.set(
             'n',
             'grd',
-            '<cmd>Trouble lsp_definitions toggle win.position=left <CR>',
+            '<cmd>Trouble lsp_definitions toggle <CR>',
             { buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP definition' }
           )
           vim.keymap.set(
             'n',
             'grr',
-            '<cmd>Trouble lsp_references toggle win.position=left <CR>',
+            '<cmd>Trouble lsp_references toggle <CR>',
             { buffer = ev.buf, noremap = true, silent = true, desc = 'Trouble LSP definition' }
           )
           vim.keymap.set(
@@ -143,7 +143,9 @@ return {
           if client.server_capabilities.codeLensProvider then
             vim.api.nvim_create_autocmd({ 'InsertLeave', 'BufWritePost', 'TextChanged' }, {
               group = vim.api.nvim_create_augroup(string.format('lsp-%s-%s', bufnr, client.id), {}),
-              callback = function() vim.lsp.codelens.refresh { bufnr = bufnr } end,
+              callback = function()
+                vim.lsp.codelens.refresh { bufnr = bufnr }
+              end,
               buffer = bufnr,
             })
             vim.lsp.codelens.refresh()
@@ -157,26 +159,38 @@ return {
     'stevearc/conform.nvim',
     event = 'VeryLazy',
     keys = {
-      { "\\f", function() vim.b.disable_autoformat = not vim.b.disable_autoformat end, mode = { "n", "x" } },
-      { "\\F", function() vim.g.disable_autoformat = not vim.g.disable_autoformat end, mode = { "n", "x" } },
+      {
+        '\\f',
+        function()
+          vim.b.disable_autoformat = not vim.b.disable_autoformat
+        end,
+        mode = { 'n', 'x' },
+      },
+      {
+        '\\F',
+        function()
+          vim.g.disable_autoformat = not vim.g.disable_autoformat
+        end,
+        mode = { 'n', 'x' },
+      },
     },
     opts = {
       notify_no_formatters = false,
       formatters_by_ft = {
-        json = { "jq" },
-        puppet = { "puppet-lint" },
-        ['*'] = { 'trim_whitespace' }
+        json = { 'jq' },
+        puppet = { 'puppet-lint' },
+        ['*'] = { 'trim_whitespace' },
       },
       format_on_save = function(bufnr)
         -- Disable with a global or buffer-local variable
         if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
           return
         end
-        return { timeout_ms = 500, lsp_format = "last" }
+        return { timeout_ms = 500, lsp_format = 'last' }
       end,
       default_format_opts = {
         timeout_ms = 500,
-        lsp_format = "last",
+        lsp_format = 'last',
       },
     },
   },
@@ -184,15 +198,15 @@ return {
     'mfussenegger/nvim-lint',
     event = 'VeryLazy',
     config = function()
-      require("lint").linters_by_ft = {
-        docker = { "hadolint" },
-        yaml = { "yamllint" },
-        puppet = { "puppet-lint" },
-        sh = { "shellcheck" },
-        go = { "golangcilint" },
-        ruby = { "rubocop" },
+      require('lint').linters_by_ft = {
+        docker = { 'hadolint' },
+        yaml = { 'yamllint' },
+        puppet = { 'puppet-lint' },
+        sh = { 'shellcheck' },
+        go = { 'golangcilint' },
+        ruby = { 'rubocop' },
       }
       vim.api.nvim_command('au BufWritePost * lua require("lint").try_lint()')
-    end
+    end,
   },
 }
diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua
index 0ac1a73..cc76c4f 100644
--- a/nvim/lua/plugins/mini.lua
+++ b/nvim/lua/plugins/mini.lua
@@ -2,13 +2,13 @@ return {
   {
     'echasnovski/mini.nvim',
     lazy = false,
-    dependencies = { "folke/snacks.nvim" },
+    dependencies = { 'folke/snacks.nvim' },
     config = function()
-      require('mini.basics').setup { mappings = { windows = true, }, }
-      require('mini.tabline').setup({
+      require('mini.basics').setup { mappings = { windows = true } }
+      require('mini.tabline').setup {
         tabpage_section = 'right',
         show_icons = false,
-      })
+      }
       require('mini.statusline').setup {
         content = {
           active = function()
@@ -48,9 +48,10 @@ return {
         require('mini.align').setup()
         require('mini.bracketed').setup()
         require('mini.icons').setup()
-        require('mini.jump2d').setup({ mappings = { start_jumping = '<leader>S' } });
+        require('mini.jump2d').setup { mappings = { start_jumping = '<leader>S' } }
+        require('mini.operators').setup()
         require('mini.surround').setup()
-        require('mini.splitjoin').setup { detect = { separator = '[,;\n]' }, }
+        require('mini.splitjoin').setup { detect = { separator = '[,;\n]' } }
 
         local miniclue = require('mini.clue')
         miniclue.setup {
@@ -66,7 +67,7 @@ return {
             { mode = 'n', keys = '[' },
           },
           window = {
-            config = { width = 'auto', },
+            config = { width = 'auto' },
           },
           clues = {
             miniclue.gen_clues.g(),
@@ -74,14 +75,14 @@ return {
             miniclue.gen_clues.registers(),
             miniclue.gen_clues.windows(),
             miniclue.gen_clues.z(),
-            { mode = 'n',          keys = '<Leader>wj', postkeys = '<Leader>w',   desc = 'TS Down' },
-            { mode = 'n',          keys = '<Leader>wk', postkeys = '<Leader>w',   desc = 'TS Up' },
-            { mode = 'n',          keys = '<Leader>wh', postkeys = '<Leader>w',   desc = 'TS Left' },
-            { mode = 'n',          keys = '<Leader>wl', postkeys = '<Leader>w',   desc = 'TS Right' },
-            { mode = 'n',          keys = '<Leader>w<C-J>', postkeys = '<Leader>w',   desc = 'Swap TS Down' },
-            { mode = 'n',          keys = '<Leader>w<C-K>', postkeys = '<Leader>w',   desc = 'Swap TS Up' },
-            { mode = 'n',          keys = '<Leader>w<C-H>', postkeys = '<Leader>w',   desc = 'Swap TS Left' },
-            { mode = 'n',          keys = '<Leader>w<C-L>', postkeys = '<Leader>w',   desc = 'Swap TS Right' },
+            { mode = 'n', keys = '<Leader>wj',     postkeys = '<Leader>w', desc = 'TS Down' },
+            { mode = 'n', keys = '<Leader>wk',     postkeys = '<Leader>w', desc = 'TS Up' },
+            { mode = 'n', keys = '<Leader>wh',     postkeys = '<Leader>w', desc = 'TS Left' },
+            { mode = 'n', keys = '<Leader>wl',     postkeys = '<Leader>w', desc = 'TS Right' },
+            { mode = 'n', keys = '<Leader>w<C-J>', postkeys = '<Leader>w', desc = 'Swap TS Down' },
+            { mode = 'n', keys = '<Leader>w<C-K>', postkeys = '<Leader>w', desc = 'Swap TS Up' },
+            { mode = 'n', keys = '<Leader>w<C-H>', postkeys = '<Leader>w', desc = 'Swap TS Left' },
+            { mode = 'n', keys = '<Leader>w<C-L>', postkeys = '<Leader>w', desc = 'Swap TS Right' },
           },
         }
 
@@ -103,54 +104,6 @@ return {
           },
         }
         vim.keymap.set('n', '<leader>nm', map.toggle, { noremap = true, desc = 'minimap open' })
-
-        local files = require("mini.files")
-        files.setup {
-          mappings = {
-            go_in_plus = "<CR>"
-          },
-          windows = {
-            preview = true,
-            width_focus = 30,
-            width_preview = 50,
-          }
-        }
-        vim.keymap.set('n', '<leader>c', files.open, { noremap = true, desc = 'minifiles open' })
-        vim.api.nvim_create_autocmd("User", {
-          pattern = "MiniFilesBufferCreate",
-          callback = function(args)
-            vim.keymap.set(
-              "n",
-              "<leader>c",
-              function()
-                files.synchronize()
-                files.close()
-              end,
-              { buffer = args.data.buf_id }
-            )
-          end,
-        })
-        vim.api.nvim_create_autocmd("User", {
-          pattern = "MiniFilesBufferCreate",
-          callback = function(args)
-            vim.keymap.set(
-              "n",
-              "`",
-              function()
-                local cur_entry_path = MiniFiles.get_fs_entry().path
-                local cur_directory = vim.fs.dirname(cur_entry_path)
-                vim.fn.chdir(cur_directory)
-              end,
-              { buffer = args.data.buf_id }
-            )
-          end,
-        })
-        vim.api.nvim_create_autocmd("User", {
-          pattern = "MiniFilesActionRename",
-          callback = function(event)
-            Snacks.rename.on_rename_file(event.data.from, event.data.to)
-          end,
-        })
       end)
     end,
   },
diff --git a/nvim/lua/plugins/misc.lua b/nvim/lua/plugins/misc.lua
index e44c6df..9343772 100644
--- a/nvim/lua/plugins/misc.lua
+++ b/nvim/lua/plugins/misc.lua
@@ -24,24 +24,24 @@ return {
       },
       view = {
         merge_tool = {
-          layout = "diff4_mixed",
+          layout = 'diff4_mixed',
           disable_diagnostics = true,
         },
       },
       keymaps = {
         view = {
-          { { "n" }, "q", vim.cmd.DiffviewClose, { desc = "Close Diffview" } },
+          { { 'n' }, 'q', vim.cmd.DiffviewClose, { desc = 'Close Diffview' } },
         },
         file_panel = {
-          { { "n" }, "q", vim.cmd.DiffviewClose, { desc = "Close Diffview" } },
+          { { 'n' }, 'q', vim.cmd.DiffviewClose, { desc = 'Close Diffview' } },
         },
         file_history_panel = {
-          { { "n" }, "q", vim.cmd.DiffviewClose, { desc = "Close Diffview" } },
-        }
-      }
+          { { 'n' }, 'q', vim.cmd.DiffviewClose, { desc = 'Close Diffview' } },
+        },
+      },
     },
     keys = {
-      { '<leader>nb', vim.cmd.DiffviewOpen, noremap = true, desc = 'diffview open' }
+      { '<leader>nb', vim.cmd.DiffviewOpen, noremap = true, desc = 'diffview open' },
     },
   },
   {
@@ -55,7 +55,9 @@ return {
     keys = {
       {
         '<leader>ng',
-        function() require('neogit').open() end,
+        function()
+          require('neogit').open()
+        end,
         { noremap = true, silent = true, desc = 'Neogit' },
       },
     },
@@ -69,10 +71,10 @@ return {
         transparent = true,
         terminal_colors = true,
         modules = {
-          "mini",
-          "treesitter",
-          "neogit",
-        }
+          'mini',
+          'treesitter',
+          'neogit',
+        },
       },
     },
     config = function(_, opts)
@@ -112,7 +114,7 @@ return {
             return ']c'
           end
           vim.schedule(function()
-            gs.next_hunk({ target = 'all' })
+            gs.next_hunk { target = 'all' }
           end)
           return '<Ignore>'
         end, { expr = true })
@@ -122,7 +124,7 @@ return {
             return '[c'
           end
           vim.schedule(function()
-            gs.prev_hunk({ target = 'all' })
+            gs.prev_hunk { target = 'all' }
           end)
           return '<Ignore>'
         end, { expr = true })
@@ -133,18 +135,25 @@ return {
     'gbprod/yanky.nvim',
     opts = {
       ring = {
-        storage = "memory",
+        storage = 'memory',
       },
       picker = {
         select = {
-          action = require('yanky.picker').actions.set_register("+")
-        }
-      }
+          action = require('yanky.picker').actions.set_register('+'),
+        },
+      },
     },
     keys = {
-      { "y",          "<Plug>(YankyYank)",         mode = { "n", "x" } },
-      { "<leader>fp", "<cmd>YankyRingHistory<cr>", mode = { "n", "x" }, noremap = true, silent = true, desc = 'Pick history (yanky.nvim)' }
+      { 'y', '<Plug>(YankyYank)', mode = { 'n', 'x' } },
+      {
+        '<leader>fp',
+        '<cmd>YankyRingHistory<cr>',
+        mode = { 'n', 'x' },
+        noremap = true,
+        silent = true,
+        desc = 'Pick history (yanky.nvim)',
+      },
     },
   },
-  { 'ThePrimeagen/refactoring.nvim', event = 'VeryLazy', config = true }
+  { 'ThePrimeagen/refactoring.nvim', event = 'VeryLazy', config = true },
 }
diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua
index 56aa37a..9e22dae 100644
--- a/nvim/lua/plugins/snacks.lua
+++ b/nvim/lua/plugins/snacks.lua
@@ -1,145 +1,215 @@
 return {
-    {
-        "folke/snacks.nvim",
-        dependencies = { "folke/trouble.nvim" },
-        lazy = false,
-        priority = 1000,
-        opts = {
-            bigfile = { enabled = true },
-            bufdelete = { enabled = true },
-            dim = { enabled = true },
-            quickfile = { enabled = true },
-            notifier = { enabled = true },
-            scope = { enabled = true },
-            terminal = { enabled = true },
-            indent = { enabled = true },
-            input = { enabled = true },
-            words = { enabled = true },
-            picker = {
-                enabled = true,
-                matcher = { frecency = true },
-                layout = {
-                    preset = function()
-                        return vim.o.columns >= 120 and "telescope" or "vertical"
-                    end
-                },
-                sources = {
-                    files = { hidden = true },
-                    grep = { hidden = true },
-                    explorer = { hidden = true },
-                    git_files = { untracked = true },
-                    smart = {
-                        multi = { "buffers", "recent", "files", "git_files" }
-                    }
-                },
-                actions = {
-                    trouble_open = function(...)
-                        return require("trouble.sources.snacks").actions.trouble_open.action(...)
-                    end,
-                },
-                win = {
-                    input = {
-                        keys = {
-                            ["wq"] = { "close", mode = "i" },
-                            ["<c-t>"] = { "trouble_open", mode = { "n", "i" } },
-                        }
-                    },
-                    list = {
-                        keys = {
-                            ["wq"] = { "close", mode = "i" },
-                        }
-                    }
-                }
-            },
+  {
+    'folke/snacks.nvim',
+    dependencies = { 'folke/trouble.nvim' },
+    lazy = false,
+    priority = 1000,
+    opts = {
+      bigfile = { enabled = true },
+      bufdelete = { enabled = true },
+      dim = { enabled = true },
+      quickfile = { enabled = true },
+      notifier = { enabled = true },
+      scope = { enabled = true },
+      terminal = { enabled = true },
+      indent = { enabled = true },
+      input = { enabled = true },
+      words = { enabled = true },
+      picker = {
+        enabled = true,
+        matcher = { frecency = true },
+        layout = {
+          preset = function()
+            return vim.o.columns >= 120 and 'telescope' or 'vertical'
+          end,
         },
-        config = function(_, opts)
-            require("snacks").setup(opts)
-            vim.api.nvim_set_hl(0, 'SnacksPickerDir', { fg = '#cccccc' })
+        sources = {
+          files = { hidden = true },
+          grep = { hidden = true },
+          explorer = { hidden = true },
+          git_files = { untracked = true },
+          smart = {
+            multi = { 'buffers', 'recent', 'files', 'git_files' },
+          },
+        },
+        actions = {
+          trouble_open = function(...)
+            return require('trouble.sources.snacks').actions.trouble_open.action(...)
+          end,
+        },
+        win = {
+          input = {
+            keys = {
+              ['wq'] = { 'close', mode = 'i' },
+              ['<c-t>'] = { 'trouble_open', mode = { 'n', 'i' } },
+            },
+          },
+          list = {
+            keys = {
+              ['wq'] = { 'close', mode = 'i' },
+            },
+          },
+        },
+      },
+    },
+    config = function(_, opts)
+      require('snacks').setup(opts)
+      vim.api.nvim_set_hl(0, 'SnacksPickerDir', { fg = '#cccccc' })
+    end,
+    keys = {
+      {
+        '<C-\\>',
+        function()
+          Snacks.terminal.toggle()
         end,
-        keys = {
-            { '<C-\\>', function() Snacks.terminal.toggle() end,         mode = { "n", "t" }, noremap = true,         desc = 'terminal open' },
-            { '<C-/>',  function() Snacks.terminal.toggle('$SHELL') end, mode = { "n", "t" }, noremap = true,         desc = 'terminal open' },
-            { 'm',      function() Snacks.words.jump(1, true) end,       noremap = true,      desc = 'next reference' },
-            { 'M',      function() Snacks.words.jump(-1, true) end,      noremap = true,      desc = 'next reference' },
-            {
-                '\\z',
-                function()
-                    if Snacks.dim.enabled then
-                        Snacks.dim.disable()
-                    else
-                        Snacks.dim.enable()
-                    end
-                end,
-                noremap = true,
-                desc = 'next reference'
-            },
-            { 'gq', function() Snacks.bufdelete() end,       noremap = true, silent = true },
-            { 'gQ', function() Snacks.bufdelete.other() end, noremap = true, silent = true },
-            {
-                '<leader>ff',
-                function() Snacks.picker.smart() end,
-                { noremap = true, silent = true, desc = 'Fuzzy find files' }
-            },
-            {
-                '<leader>fe',
-                function() Snacks.explorer() end,
-                { noremap = true, silent = true, desc = 'snacks explorer' }
-            },
-            {
-                '<leader>fE',
-                function() Snacks.explorer.reveal() end,
-                { noremap = true, silent = true, desc = 'snacks explorer open current file' }
-            },
-            {
-                '<leader>fg',
-                function() Snacks.picker.git_files() end,
-                { noremap = true, silent = true, desc = 'Fuzzy find files' }
-            },
-            {
-                '<leader>fa',
-                function() Snacks.picker.grep() end,
-                { noremap = true, silent = true, desc = 'Fuzzy find grep' }
-            },
-            {
-                '<leader>f8',
-                function() Snacks.picker.grep_word() end,
-                { noremap = true, silent = true, desc = 'Fuzzy find grep word' }
-            },
-            {
-                '<leader>f?',
-                function() Snacks.picker.pickers() end,
-                { noremap = true, silent = true, desc = 'See all pickers' }
-            },
-            {
-                '<leader>f\'',
-                function() Snacks.picker.marks() end,
-                { noremap = true, silent = true, desc = 'Pick marks' }
-            },
-            {
-                '<leader>fu',
-                function() Snacks.picker.undo() end,
-                { noremap = true, silent = true, desc = 'Pick undotree' }
-            },
-            {
-                '<leader>fj',
-                function() Snacks.picker.jumps() end,
-                { noremap = true, silent = true, desc = 'Pick jumps' }
-            },
-            {
-                '<leader>f.',
-                function() Snacks.picker.resume() end,
-                { noremap = true, silent = true, desc = 'Fuzzy find resume' }
-            },
-            {
-                '<leader><leader>',
-                function() Snacks.picker.buffers() end,
-                { noremap = true, silent = true, desc = 'Fuzzy find buffers' }
-            },
-            {
-                '<leader>fn',
-                function() Snacks.picker.notifications() end,
-                { noremap = true, silent = true, desc = 'pick notifications' }
-            },
-        }
-    }
+        mode = { 'n', 't' },
+        noremap = true,
+        desc = 'terminal open',
+      },
+      {
+        '<C-/>',
+        function()
+          Snacks.terminal.toggle('$SHELL')
+        end,
+        mode = { 'n', 't' },
+        noremap = true,
+        desc = 'terminal open',
+      },
+      {
+        ']r',
+        function()
+          Snacks.words.jump(1, true)
+        end,
+        noremap = true,
+        desc = 'next reference',
+      },
+      {
+        '[r',
+        function()
+          Snacks.words.jump(-1, true)
+        end,
+        noremap = true,
+        desc = 'next reference',
+      },
+      {
+        '\\z',
+        function()
+          if Snacks.dim.enabled then
+            Snacks.dim.disable()
+          else
+            Snacks.dim.enable()
+          end
+        end,
+        noremap = true,
+        desc = 'next reference',
+      },
+      {
+        'gq',
+        function()
+          Snacks.bufdelete()
+        end,
+        noremap = true,
+        silent = true,
+      },
+      {
+        'gQ',
+        function()
+          Snacks.bufdelete.other()
+        end,
+        noremap = true,
+        silent = true,
+      },
+      {
+        '<leader>ff',
+        function()
+          Snacks.picker.smart()
+        end,
+        { noremap = true, silent = true, desc = 'Fuzzy find files' },
+      },
+      {
+        '<leader>fe',
+        function()
+          Snacks.explorer()
+        end,
+        { noremap = true, silent = true, desc = 'snacks explorer' },
+      },
+      {
+        '<leader>fE',
+        function()
+          Snacks.explorer.reveal()
+        end,
+        { noremap = true, silent = true, desc = 'snacks explorer open current file' },
+      },
+      {
+        '<leader>fg',
+        function()
+          Snacks.picker.git_files()
+        end,
+        { noremap = true, silent = true, desc = 'Fuzzy find files' },
+      },
+      {
+        '<leader>fa',
+        function()
+          Snacks.picker.grep()
+        end,
+        { noremap = true, silent = true, desc = 'Fuzzy find grep' },
+      },
+      {
+        '<leader>f8',
+        function()
+          Snacks.picker.grep_word()
+        end,
+        { noremap = true, silent = true, desc = 'Fuzzy find grep word' },
+      },
+      {
+        '<leader>f?',
+        function()
+          Snacks.picker.pickers()
+        end,
+        { noremap = true, silent = true, desc = 'See all pickers' },
+      },
+      {
+        "<leader>f'",
+        function()
+          Snacks.picker.marks()
+        end,
+        { noremap = true, silent = true, desc = 'Pick marks' },
+      },
+      {
+        '<leader>fu',
+        function()
+          Snacks.picker.undo()
+        end,
+        { noremap = true, silent = true, desc = 'Pick undotree' },
+      },
+      {
+        '<leader>fj',
+        function()
+          Snacks.picker.jumps()
+        end,
+        { noremap = true, silent = true, desc = 'Pick jumps' },
+      },
+      {
+        '<leader>f.',
+        function()
+          Snacks.picker.resume()
+        end,
+        { noremap = true, silent = true, desc = 'Fuzzy find resume' },
+      },
+      {
+        '<leader><leader>',
+        function()
+          Snacks.picker.buffers()
+        end,
+        { noremap = true, silent = true, desc = 'Fuzzy find buffers' },
+      },
+      {
+        '<leader>fn',
+        function()
+          Snacks.picker.notifications()
+        end,
+        { noremap = true, silent = true, desc = 'pick notifications' },
+      },
+    },
+  },
 }
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index 16f98c2..37a48cd 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -8,22 +8,22 @@ return {
         opts = {
           max_lines = 2,
           min_window_height = 50,
-        }
+        },
       },
       'nvim-treesitter/nvim-treesitter-textobjects',
       {
         'aaronik/treewalker.nvim',
         keys = {
-          { "<leader>wj", '<cmd>Treewalker Down<cr>',  silent = true, desc = 'Down (Treewalker)' },
-          { "<leader>wk", '<cmd>Treewalker Up<cr>',    silent = true, desc = 'Up (Treewalker)' },
-          { "<leader>wh", '<cmd>Treewalker Left<cr>',  silent = true, desc = 'Left (Treewalker)' },
-          { "<leader>wl", '<cmd>Treewalker Right<cr>', silent = true, desc = 'Right (Treewalker)' },
-          { "<leader>w<C-J>", '<cmd>Treewalker SwapDown<cr>',  silent = true, desc = 'SwapDown (Treewalker)' },
-          { "<leader>w<C-K>", '<cmd>Treewalker SwapUp<cr>',    silent = true, desc = 'SwapUp (Treewalker)' },
-          { "<leader>w<C-H>", '<cmd>Treewalker SwapLeft<cr>',  silent = true, desc = 'SwapLeft (Treewalker)' },
-          { "<leader>w<C-L>", '<cmd>Treewalker SwapRight<cr>', silent = true, desc = 'SwapRight (Treewalker)' },
-        }
-      }
+          { '<leader>wj',     '<cmd>Treewalker Down<cr>',      silent = true, desc = 'Down (Treewalker)' },
+          { '<leader>wk',     '<cmd>Treewalker Up<cr>',        silent = true, desc = 'Up (Treewalker)' },
+          { '<leader>wh',     '<cmd>Treewalker Left<cr>',      silent = true, desc = 'Left (Treewalker)' },
+          { '<leader>wl',     '<cmd>Treewalker Right<cr>',     silent = true, desc = 'Right (Treewalker)' },
+          { '<leader>w<C-J>', '<cmd>Treewalker SwapDown<cr>',  silent = true, desc = 'SwapDown (Treewalker)' },
+          { '<leader>w<C-K>', '<cmd>Treewalker SwapUp<cr>',    silent = true, desc = 'SwapUp (Treewalker)' },
+          { '<leader>w<C-H>', '<cmd>Treewalker SwapLeft<cr>',  silent = true, desc = 'SwapLeft (Treewalker)' },
+          { '<leader>w<C-L>', '<cmd>Treewalker SwapRight<cr>', silent = true, desc = 'SwapRight (Treewalker)' },
+        },
+      },
     },
     config = function()
       require('nvim-treesitter.configs').setup {
@@ -46,8 +46,8 @@ return {
               ['af'] = '@function.outer',
               ['if'] = '@function.inner',
               ['ia'] = '@parameter.inner',
-              ["ik"] = "@assignment.lhs",
-              ["iv"] = "@assignment.rhs",
+              ['ik'] = '@assignment.lhs',
+              ['iv'] = '@assignment.rhs',
             },
           },
           move = {
@@ -82,7 +82,6 @@ return {
           },
         },
       }
-
     end,
   },
 }