diff --git a/lua/core/globals.lua b/lua/core/globals.lua
index 4ce7d311..3018d778 100644
--- a/lua/core/globals.lua
+++ b/lua/core/globals.lua
@@ -110,6 +110,14 @@ Glyphs = {
     task = ' ',
     list = { '●', '○', '◆', '◇' },
   },
+  snacksPicker = {
+    lsp = {
+      unavailable = '',
+      enabled = '',
+      disabled = '',
+      attached = '',
+    },
+  },
   diagnostics = {
     error = '',
     warn = '',
diff --git a/lua/plugins/fzf-lua.lua b/lua/plugins/fzf-lua.lua
index 0eb986e9..fb2353fd 100644
--- a/lua/plugins/fzf-lua.lua
+++ b/lua/plugins/fzf-lua.lua
@@ -44,16 +44,18 @@ return {
       fl.live_grep { cwd = '~/.local/share/nvim/lazy/' }
     end, { desc = 'Grep Neovim plugins src' })
 
-    -- Git specific
-    vim.keymap.set('n', '<leader>GC', fl.git_bcommits, { desc = 'Git: commits - current buf' })
-    vim.keymap.set('n', '<leader>GS', fl.git_stash, { desc = 'Git: stash' })
-    vim.keymap.set('n', '<leader>Gb', fl.git_branches, { desc = 'Git: branches' })
-    vim.keymap.set('n', '<leader>Gc', fl.git_commits, { desc = 'Git: commits' })
-    vim.keymap.set('n', '<leader>Gd', fl.git_diff, { desc = 'Git: diff' })
-    vim.keymap.set('n', '<leader>Gf', fl.git_files, { desc = 'Git: files' })
-    vim.keymap.set('n', '<leader>Gh', fl.git_hunks, { desc = 'Git: hunks' })
-    vim.keymap.set('n', '<leader>Gs', fl.git_status, { desc = 'Git: status' })
-    vim.keymap.set('n', '<leader>Gw', fl.git_worktrees, { desc = 'Git: worktrees' })
+    -- -- Git specific
+    -- vim.keymap.set('n', '<leader>GC', fl.git_bcommits, { desc = 'Git: commits - current buf' })
+    -- vim.keymap.set('n', '<leader>GS', fl.git_stash, { desc = 'Git: stash' })
+    -- vim.keymap.set('n', '<leader>Gb', fl.git_branches, { desc = 'Git: branches' })
+    -- vim.keymap.set('n', '<leader>Gc', fl.git_commits, { desc = 'Git: commits' })
+    -- vim.keymap.set('n', '<leader>Gd', fl.git_diff, { desc = 'Git: diff' })
+    -- vim.keymap.set('n', '<leader>Gf', fl.git_files, { desc = 'Git: files' })
+    -- vim.keymap.set('n', '<leader>Gh', fl.git_hunks, { desc = 'Git: hunks' })
+    -- vim.keymap.set('n', '<leader>Gs', fl.git_status, { desc = 'Git: status' })
+    -- vim.keymap.set('n', '<leader>Gw', fl.git_worktrees, { desc = 'Git: worktrees' })
+    -- vim.keymap.set('n', '<leader>vh', fl.git_hunks, { desc = 'Git: hunks' })
+    -- vim.keymap.set('n', '<leader>vw', fl.git_worktrees, { desc = 'Git: worktrees' })
 
     -- LSP specific
     vim.api.nvim_create_autocmd('LspAttach', {
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
new file mode 100644
index 00000000..f4360bd4
--- /dev/null
+++ b/lua/plugins/snacks.lua
@@ -0,0 +1,314 @@
+return {
+  'folke/snacks.nvim',
+  config = function()
+    Snacks = require 'snacks'
+    Snacks.setup {
+      picker = {
+        prompt = Glyphs.ui.prompt .. ' ',
+        sources = {},
+        focus = 'input',
+        show_delay = 5000,
+        limit_live = 10000,
+        layout = {
+          cycle = true,
+          --- Use the default layout or vertical if the window is too narrow
+          preset = function()
+            return vim.o.columns >= 120 and 'default' or 'vertical'
+          end,
+        },
+        layouts = {
+          default = {
+            layout = {
+              box = 'horizontal',
+              width = 0.8,
+              min_width = 120,
+              height = 0.8,
+              {
+                box = 'vertical',
+                border = true,
+                title = '{title} {live} {flags}',
+                { win = 'input', height = 1, border = 'bottom' },
+                { win = 'list', border = 'none' },
+              },
+              { win = 'preview', title = '{preview}', border = true, width = 0.6 },
+            },
+          },
+          vertical = {
+            layout = {
+              backdrop = false,
+              width = 0.5,
+              min_width = 80,
+              height = 0.8,
+              min_height = 30,
+              box = 'vertical',
+              border = true,
+              title = '{title} {live} {flags}',
+              title_pos = 'center',
+              { win = 'input', height = 1, border = 'bottom' },
+              { win = 'list', border = 'none' },
+              { win = 'preview', title = '{preview}', height = 0.6, border = 'top' },
+            },
+          },
+        },
+        ---@class snacks.picker.matcher.Config
+        matcher = {
+          fuzzy = true, -- use fuzzy matching
+          smartcase = true, -- use smartcase
+          ignorecase = true, -- use ignorecase
+          sort_empty = false, -- sort results when the search string is empty
+          filename_bonus = true, -- give bonus for matching file names (last part of the path)
+          file_pos = true, -- support patterns like `file:line:col` and `file:line`
+          -- the bonusses below, possibly require string concatenation and path normalization,
+          -- so this can have a performance impact for large lists and increase memory usage
+          cwd_bonus = false, -- give bonus for matching files in the cwd
+          frecency = false, -- frecency bonus
+          history_bonus = false, -- give more weight to chronological order
+        },
+        sort = {
+          -- default sort is by score, text length and index
+          fields = { 'score:desc', '#text', 'idx' },
+        },
+        ui_select = true, -- replace `vim.ui.select` with the snacks picker
+        ---@class snacks.picker.formatters.Config
+        formatters = {
+          text = {
+            ft = nil, ---@type string? filetype for highlighting
+          },
+          file = {
+            filename_first = false, -- display filename before the file path
+            --- * left: truncate the beginning of the path
+            --- * center: truncate the middle of the path
+            --- * right: truncate the end of the path
+            ---@type "left"|"center"|"right"
+            truncate = 'center',
+            min_width = 40, -- minimum length of the truncated path
+            filename_only = false, -- only show the filename
+            icon_width = 2, -- width of the icon (in characters)
+            git_status_hl = true, -- use the git status highlight group for the filename
+          },
+          selected = {
+            show_always = false, -- only show the selected column when there are multiple selections
+            unselected = true, -- use the unselected icon for unselected items
+          },
+          severity = {
+            icons = true, -- show severity icons
+            level = false, -- show severity level
+            ---@type "left"|"right"
+            pos = 'left', -- position of the diagnostics
+          },
+        },
+        ---@class snacks.picker.previewers.Config
+        previewers = {
+          diff = {
+            -- fancy: Snacks fancy diff (borders, multi-column line numbers, syntax highlighting)
+            -- syntax: Neovim's built-in diff syntax highlighting
+            -- terminal: external command (git's pager for git commands, `cmd` for other diffs)
+            style = 'fancy', ---@type "fancy"|"syntax"|"terminal"
+            cmd = { 'delta' }, -- example for using `delta` as the external diff command
+            ---@type vim.wo?|{} window options for the fancy diff preview window
+            wo = {
+              breakindent = true,
+              wrap = true,
+              linebreak = true,
+              showbreak = '',
+            },
+          },
+          git = {
+            args = {}, -- additional arguments passed to the git command. Useful to set pager options usin `-c ...`
+          },
+          file = {
+            max_size = 1024 * 1024, -- 1MB
+            max_line_length = 500, -- max line length
+            ft = nil, ---@type string? filetype for highlighting. Use `nil` for auto detect
+          },
+          man_pager = nil, ---@type string? MANPAGER env to use for `man` preview
+        },
+        ---@class snacks.picker.jump.Config
+        jump = {
+          jumplist = true, -- save the current position in the jumplist
+          tagstack = false, -- save the current position in the tagstack
+          reuse_win = false, -- reuse an existing window if the buffer is already open
+          close = true, -- close the picker when jumping/editing to a location (defaults to true)
+          match = false, -- jump to the first match position. (useful for `lines`)
+        },
+        toggles = {
+          follow = 'f',
+          hidden = 'h',
+          ignored = 'i',
+          modified = 'm',
+          regex = { icon = 'R', value = false },
+        },
+        win = {
+          -- input window
+          input = {
+            keys = {
+              -- to close the picker on ESC instead of going to normal mode,
+              -- add the following keymap to your config
+              -- ["<Esc>"] = { "close", mode = { "n", "i" } },
+              ['/'] = 'toggle_focus',
+              ['<C-Down>'] = { 'history_forward', mode = { 'i', 'n' } },
+              ['<C-Up>'] = { 'history_back', mode = { 'i', 'n' } },
+              ['<C-c>'] = { 'cancel', mode = 'i' },
+              ['<C-w>'] = { '<c-s-w>', mode = { 'i' }, expr = true, desc = 'delete word' },
+              ['<CR>'] = { 'confirm', mode = { 'n', 'i' } },
+              ['<Down>'] = { 'list_down', mode = { 'i', 'n' } },
+              ['<Esc>'] = 'cancel',
+              ['<S-CR>'] = { { 'pick_win', 'jump' }, mode = { 'n', 'i' } },
+              ['<S-Tab>'] = { 'select_and_prev', mode = { 'i', 'n' } },
+              ['<Tab>'] = { 'select_and_next', mode = { 'i', 'n' } },
+              ['<Up>'] = { 'list_up', mode = { 'i', 'n' } },
+              ['<a-d>'] = { 'inspect', mode = { 'n', 'i' } },
+              ['<a-f>'] = { 'toggle_follow', mode = { 'i', 'n' } },
+              ['<a-h>'] = { 'toggle_hidden', mode = { 'i', 'n' } },
+              ['<a-i>'] = { 'toggle_ignored', mode = { 'i', 'n' } },
+              ['<a-r>'] = { 'toggle_regex', mode = { 'i', 'n' } },
+              ['<a-m>'] = { 'toggle_maximize', mode = { 'i', 'n' } },
+              ['<a-p>'] = { 'toggle_preview', mode = { 'i', 'n' } },
+              ['<a-w>'] = { 'cycle_win', mode = { 'i', 'n' } },
+              ['<c-a>'] = { 'select_all', mode = { 'n', 'i' } },
+              ['<c-b>'] = { 'preview_scroll_up', mode = { 'i', 'n' } },
+              ['<c-d>'] = { 'list_scroll_down', mode = { 'i', 'n' } },
+              ['<c-f>'] = { 'preview_scroll_down', mode = { 'i', 'n' } },
+              ['<c-g>'] = { 'toggle_live', mode = { 'i', 'n' } },
+              ['<c-j>'] = { 'list_down', mode = { 'i', 'n' } },
+              ['<c-k>'] = { 'list_up', mode = { 'i', 'n' } },
+              ['<c-n>'] = { 'list_down', mode = { 'i', 'n' } },
+              ['<c-p>'] = { 'list_up', mode = { 'i', 'n' } },
+              ['<c-q>'] = { 'qflist', mode = { 'i', 'n' } },
+              ['<c-s>'] = { 'edit_split', mode = { 'i', 'n' } },
+              ['<c-t>'] = { 'tab', mode = { 'n', 'i' } },
+              ['<c-u>'] = { 'list_scroll_up', mode = { 'i', 'n' } },
+              ['<c-v>'] = { 'edit_vsplit', mode = { 'i', 'n' } },
+              ['<c-r>#'] = { 'insert_alt', mode = 'i' },
+              ['<c-r>%'] = { 'insert_filename', mode = 'i' },
+              ['<c-r><c-a>'] = { 'insert_cWORD', mode = 'i' },
+              ['<c-r><c-f>'] = { 'insert_file', mode = 'i' },
+              ['<c-r><c-l>'] = { 'insert_line', mode = 'i' },
+              ['<c-r><c-p>'] = { 'insert_file_full', mode = 'i' },
+              ['<c-r><c-w>'] = { 'insert_cword', mode = 'i' },
+              ['<c-w>H'] = 'layout_left',
+              ['<c-w>J'] = 'layout_bottom',
+              ['<c-w>K'] = 'layout_top',
+              ['<c-w>L'] = 'layout_right',
+              ['?'] = 'toggle_help_input',
+              ['G'] = 'list_bottom',
+              ['gg'] = 'list_top',
+              ['j'] = 'list_down',
+              ['k'] = 'list_up',
+              ['q'] = 'cancel',
+            },
+            b = {
+              minipairs_disable = true,
+            },
+          },
+          -- result list window
+          list = {
+            keys = {
+              ['/'] = 'toggle_focus',
+              ['<2-LeftMouse>'] = 'confirm',
+              ['<CR>'] = 'confirm',
+              ['<Down>'] = 'list_down',
+              ['<Esc>'] = 'cancel',
+              ['<S-CR>'] = { { 'pick_win', 'jump' } },
+              ['<S-Tab>'] = { 'select_and_prev', mode = { 'n', 'x' } },
+              ['<Tab>'] = { 'select_and_next', mode = { 'n', 'x' } },
+              ['<Up>'] = 'list_up',
+              ['<a-d>'] = 'inspect',
+              ['<a-f>'] = 'toggle_follow',
+              ['<a-h>'] = 'toggle_hidden',
+              ['<a-i>'] = 'toggle_ignored',
+              ['<a-m>'] = 'toggle_maximize',
+              ['<a-p>'] = 'toggle_preview',
+              ['<a-w>'] = 'cycle_win',
+              ['<c-a>'] = 'select_all',
+              ['<c-b>'] = 'preview_scroll_up',
+              ['<c-d>'] = 'list_scroll_down',
+              ['<c-f>'] = 'preview_scroll_down',
+              ['<c-j>'] = 'list_down',
+              ['<c-k>'] = 'list_up',
+              ['<c-n>'] = 'list_down',
+              ['<c-p>'] = 'list_up',
+              ['<c-q>'] = 'qflist',
+              ['<c-g>'] = 'print_path',
+              ['<c-s>'] = 'edit_split',
+              ['<c-t>'] = 'tab',
+              ['<c-u>'] = 'list_scroll_up',
+              ['<c-v>'] = 'edit_vsplit',
+              ['<c-w>H'] = 'layout_left',
+              ['<c-w>J'] = 'layout_bottom',
+              ['<c-w>K'] = 'layout_top',
+              ['<c-w>L'] = 'layout_right',
+              ['?'] = 'toggle_help_list',
+              ['G'] = 'list_bottom',
+              ['gg'] = 'list_top',
+              ['i'] = 'focus_input',
+              ['j'] = 'list_down',
+              ['k'] = 'list_up',
+              ['q'] = 'cancel',
+              ['zb'] = 'list_scroll_bottom',
+              ['zt'] = 'list_scroll_top',
+              ['zz'] = 'list_scroll_center',
+            },
+            wo = {
+              conceallevel = 2,
+              concealcursor = 'nvc',
+            },
+          },
+          -- preview window
+          preview = {
+            keys = {
+              ['<Esc>'] = 'cancel',
+              ['q'] = 'cancel',
+              ['i'] = 'focus_input',
+              ['<a-w>'] = 'cycle_win',
+            },
+          },
+        },
+        ---@class snacks.picker.icons
+        icons = Glyphs.snacksPicker,
+
+        ---@class snacks.picker.db.Config
+        db = {
+          -- path to the sqlite3 library
+          -- If not set, it will try to load the library by name.
+          -- On Windows it will download the library from the internet.
+          sqlite3_path = nil, ---@type string?
+        },
+        ---@class snacks.picker.debug
+        debug = {
+          scores = false, -- show scores in the list
+          leaks = false, -- show when pickers don't get garbage collected
+          explorer = false, -- show explorer debug info
+          files = false, -- show file debug info
+          grep = false, -- show file debug info
+          proc = false, -- show proc debug info
+          extmarks = false, -- show extmarks errors
+        },
+      },
+    }
+
+    vim.keymap.set('n', '<leader>fy', Snacks.picker.cliphist, { desc = 'Clipboard history' })
+
+    vim.api.nvim_create_autocmd({ 'VimEnter', 'DirChanged' }, {
+      group = vim.api.nvim_create_augroup('snacksPicker-git-attach', { clear = true }),
+      callback = function(event)
+        -- check if the workspace is a git repo
+        local code = vim.system({ 'git', 'rev-parse', '--is-inside-work-tree' }, {}, nil):wait().code
+        if code ~= 0 then
+          return
+        end
+
+        vim.keymap.set('n', '<leader>vC', Snacks.picker.git_log_file, { desc = 'Git: commits - current buf' })
+        vim.keymap.set('n', '<leader>vS', Snacks.picker.git_stash, { desc = 'Git: stash' })
+        vim.keymap.set('n', '<leader>vb', Snacks.picker.git_branches, { desc = 'Git: branches' })
+        vim.keymap.set('n', '<leader>vc', Snacks.picker.git_log, { desc = 'Git: commits' })
+        vim.keymap.set('n', '<leader>vd', Snacks.picker.git_diff, { desc = 'Git: diff' })
+        vim.keymap.set('n', '<leader>vf', Snacks.picker.git_files, { desc = 'Git: files' })
+        vim.keymap.set('n', '<leader>vl', Snacks.picker.git_log_line, { desc = 'Git: commits - current line' })
+        vim.keymap.set('n', '<leader>vs', Snacks.picker.git_status, { desc = 'Git: status' })
+      end,
+    })
+
+    vim.keymap.set('n', '<leader>lc', Snacks.picker.lsp_config, { desc = 'LSP: lsp-config info' })
+  end,
+}
diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua
index 7b84cccd..a2c883ec 100644
--- a/lua/plugins/which-key.lua
+++ b/lua/plugins/which-key.lua
@@ -23,6 +23,7 @@ return {
       { '<leader>f', group = '[F]uzzy-find', mode = { 'n', 'v' } },
       { '<leader>g', group = '[G]rep', mode = { 'n', 'v' } },
       { '<leader>G', group = '[G]it', mode = { 'n', 'v' } },
+      { '<leader>v', group = '[V]ersion control', mode = { 'n', 'v' } },
       { '<leader>l', group = '[L]SP', mode = { 'n', 'v' } },
       { '<leader>t', group = '[T]oggle' },
       { '<leader>d', group = '[D]iangostic' },