From 9691ad2d643308b02535b9eaba98bd6ae435fa74 Mon Sep 17 00:00:00 2001
From: zymon <s@zymon.org>
Date: Sun, 16 Feb 2025 23:02:30 +0100
Subject: [PATCH] reorder

---
 init.lua                   | 21 +---------
 lua/znvim/init.lua         |  7 ++++
 lua/znvim/lazy.lua         | 13 ++++++
 lua/znvim/plugins/init.lua | 86 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 106 insertions(+), 21 deletions(-)
 create mode 100644 lua/znvim/lazy.lua

diff --git a/init.lua b/init.lua
index 26027f2..63dd8fd 100644
--- a/init.lua
+++ b/init.lua
@@ -1,20 +1 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-    vim.fn.system({
-        "git",
-        "clone",
-        "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
-        "--branch=stable", -- latest stable release
-        lazypath,
-    })
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("znvim.options")
-require("lazy").setup("znvim.plugins")
-require("znvim.keymaps")
-require("znvim.autocmds")
-
-vim.cmd[[colorscheme tokyonight]]
-vim.cmd[[hi clear Folded]]
+require("znvim")
diff --git a/lua/znvim/init.lua b/lua/znvim/init.lua
index e69de29..dd5dca7 100644
--- a/lua/znvim/init.lua
+++ b/lua/znvim/init.lua
@@ -0,0 +1,7 @@
+require("znvim.options")
+require("znvim.lazy")
+require("znvim.keymaps")
+require("znvim.autocmds")
+
+vim.cmd[[colorscheme tokyonight]]
+vim.cmd[[hi clear Folded]]
diff --git a/lua/znvim/lazy.lua b/lua/znvim/lazy.lua
new file mode 100644
index 0000000..010f98c
--- /dev/null
+++ b/lua/znvim/lazy.lua
@@ -0,0 +1,13 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+    vim.fn.system({
+        "git",
+        "clone",
+        "--filter=blob:none",
+        "https://github.com/folke/lazy.nvim.git",
+        "--branch=stable", -- latest stable release
+        lazypath,
+    })
+end
+vim.opt.rtp:prepend(lazypath)
+require("lazy").setup("znvim.plugins")
diff --git a/lua/znvim/plugins/init.lua b/lua/znvim/plugins/init.lua
index 2fbbecd..cc86e81 100644
--- a/lua/znvim/plugins/init.lua
+++ b/lua/znvim/plugins/init.lua
@@ -140,8 +140,92 @@ return {
             { "<leader>pp", function () require("snacks").picker() end, desc = "pick picker", },
             { "<leader>pg", function () require("snacks").picker.grep() end, desc = "pick string", },
             { "<leader>pf", function () require("snacks").picker.files() end, desc = "pick files", },
+            {
+                "<leader>gk",
+                function()
+                    require("snacks").picker.git_log({
+                        finder = "git_log",
+                        format = "git_log",
+                        preview = "git_show",
+                        confirm = "git_checkout",
+                        layout = "vertical",
+                    })
+                end,
+                desc = "Git Log",
+            },
+            {
+                "<leader>gm",
+                function()
+                    require("snacks").picker.git_branches({
+                        layout = "select",
+                    })
+                end,
+                desc = "Keymaps",
+            },
+            {
+                "<leader><space>",
+                function()
+                    require("snacks").picker.files({
+                        finder = "files",
+                        format = "file",
+                        show_empty = true,
+                        supports_live = true,
+                        -- In case you want to override the layout for this keymap
+                        -- layout = "vscode",
+                    })
+                end,
+                desc = "Find Files",
+            },
+            -- Navigate my buffers
+            {
+                "<leader>pb",
+                function()
+                    require("snacks").picker.buffers({
+                        -- I always want my buffers picker to start in normal mode
+                        on_show = function()
+                            vim.cmd.stopinsert()
+                        end,
+                        finder = "buffers",
+                        format = "buffer",
+                        hidden = false,
+                        unloaded = true,
+                        current = true,
+                        sort_lastused = true,
+                        win = {
+                            input = {
+                                keys = {
+                                    ["d"] = "bufdelete",
+                                },
+                            },
+                            list = { keys = { ["d"] = "bufdelete" } },
+                        },
+                        -- In case you want to override the layout for this keymap
+                        -- layout = "ivy",
+                    })
+                end,
+                desc = "[P]Snacks picker buffers",
+            },
         },
         opts = {
+            picker = {
+                matcher = {
+                    frecency = true,
+                },
+                win = {
+                    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" } },
+                            -- I'm used to scrolling like this in LazyGit
+                            ["J"] = { "preview_scroll_down", mode = { "i", "n" } },
+                            ["K"] = { "preview_scroll_up", mode = { "i", "n" } },
+                            ["H"] = { "preview_scroll_left", mode = { "i", "n" } },
+                            ["L"] = { "preview_scroll_right", mode = { "i", "n" } },
+                        },
+                    },
+                },
+            },
             bigfile = { enabled = true },
             -- notifier = { enabled = true },
             quickfile = { enabled = true },
@@ -211,7 +295,7 @@ return {
         ft = "typst",
         version = "1.*",
         keys = {
-            { "<localleader>p", "<CMD>TypstPreview document<CR>", desc = "open typst preview document", },
+            { "<localleader>pd", "<CMD>TypstPreview document<CR>", desc = "open typst preview document", },
             { "<localleader>ps", "<CMD>TypstPreview slide<CR>", desc = "open typst preview slide", },
             { "<localleader>s", "<CMD>TypstPreviewStop<CR>", desc = "stop typst preview", },
             { "<localleader><SPACE>", "<CMD>TypstPreviewSyncCursor<CR>", desc = "sync cursor", },