From 55582869341ac5a2c061419aedd14794e030d5a3 Mon Sep 17 00:00:00 2001
From: linrongbin16 <linrongbin16@outlook.com>
Date: Fri, 27 Oct 2023 17:00:45 +0800
Subject: [PATCH] feat(stickybuf.nvim): stick to non-editable buffer (#334)

* perf(stickybuf.nvim): stick to buf

* perf(stickybuf.nvim): migrate 'keymap.exec' to sticky

* feat(stickybuf.nvim): stick to buf

* feat(stickybuf.nvim): migrate to sticky
---
 lua/builtin/utils/keymap.lua                  |  55 ----
 lua/configs/Pocco81/auto-save-nvim/keys.lua   |   6 +-
 lua/configs/akinsho/bufferline-nvim/keys.lua  |  32 +--
 lua/configs/folke/trouble-nvim/keys.lua       |   6 +-
 lua/configs/gbprod/yanky-nvim/keys.lua        |  19 +-
 lua/configs/linrongbin16/fzfx-nvim/keys.lua   |  70 ++---
 lua/configs/moll/vim-bbye/keys.lua            |  10 +-
 .../nvim-telescope/telescope-nvim/keys.lua    | 272 ++++++------------
 lua/configs/stevearc/oil-nvim/keys.lua        |  13 +-
 .../stevearc/stickybuf-nvim/config.lua        |   1 +
 lua/plugins/init.lua                          |   5 +
 11 files changed, 163 insertions(+), 326 deletions(-)
 create mode 100644 lua/configs/stevearc/stickybuf-nvim/config.lua

diff --git a/lua/builtin/utils/keymap.lua b/lua/builtin/utils/keymap.lua
index d3d8dd77..1d507c58 100644
--- a/lua/builtin/utils/keymap.lua
+++ b/lua/builtin/utils/keymap.lua
@@ -1,59 +1,5 @@
 -- ---- Key Map ----
 
---- @type string[]
-local NON_EDITABLE_FIELTYPES = {
-    ["neo-tree"] = true,
-    ["NvimTree"] = true,
-    ["undotree"] = true,
-    ["vista"] = true,
-    ["diff"] = true,
-    ["CHADTree"] = true,
-}
-
---- @return boolean
-local function invalid_window()
-    local buf_filetype = vim.bo.filetype
-    return NON_EDITABLE_FIELTYPES[buf_filetype] ~= nil
-        and NON_EDITABLE_FIELTYPES[buf_filetype] == true
-end
-
---- @param cmd string|function
---- @return string|function
-local function exec(cmd)
-    --- @param o string|function
-    local function exec_impl(o)
-        if type(o) == "string" then
-            -- vim command
-            vim.cmd(o)
-        else
-            -- lua function
-            o()
-        end
-    end
-
-    --- @return nil
-    local function wrap()
-        local n = vim.fn.winnr("$")
-        local i = 0
-        while i < n do
-            i = i + 1
-            if invalid_window() then
-                -- current window is invalid
-                -- go to next window
-                vim.cmd("wincmd w")
-            else
-                exec_impl(cmd)
-                return
-            end
-        end
-        -- finally cannot find a valid window
-        -- execute command anyway
-        exec_impl(cmd)
-    end
-
-    return wrap
-end
-
 --- @param rhs string|function|nil
 --- @param opts table<any, any>
 --- @return table<any, any>
@@ -99,7 +45,6 @@ local function set_lazy_key(mode, lhs, rhs, opts)
 end
 
 local M = {
-    exec = exec,
     set_key = set_key,
     set_lazy_key = set_lazy_key,
 }
diff --git a/lua/configs/Pocco81/auto-save-nvim/keys.lua b/lua/configs/Pocco81/auto-save-nvim/keys.lua
index edbed5c5..7d361c0f 100644
--- a/lua/configs/Pocco81/auto-save-nvim/keys.lua
+++ b/lua/configs/Pocco81/auto-save-nvim/keys.lua
@@ -1,10 +1,10 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 
 local M = {
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<leader>as",
-        keymap.exec("ASToggle"),
+        "<cmd>ASToggle<cr>",
         { desc = "Toggle auto-save" }
     ),
 }
diff --git a/lua/configs/akinsho/bufferline-nvim/keys.lua b/lua/configs/akinsho/bufferline-nvim/keys.lua
index 09ce73bb..91e77fa8 100644
--- a/lua/configs/akinsho/bufferline-nvim/keys.lua
+++ b/lua/configs/akinsho/bufferline-nvim/keys.lua
@@ -1,39 +1,39 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 
 local M = {
     -- go to the last buffer
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<leader>0",
-        keymap.exec("lua require('bufferline').go_to_buffer(-1, true)"),
+        "<cmd>lua require('bufferline').go_to_buffer(-1, true)<cr>",
         { desc = "Go to the last buffer" }
     ),
 
     -- go to next/previous buffer
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "]b",
-        keymap.exec("BufferLineCycleNext"),
+        "<cmd>BufferLineCycleNext<cr>",
         { desc = "Go to next buffer" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "[b",
-        keymap.exec("BufferLineCyclePrev"),
+        "<cmd>BufferLineCyclePrev<cr>",
         { desc = "Go to previous buffer" }
     ),
 
     -- move/re-order buffer to next/previous position
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<leader>.",
-        keymap.exec("BufferLineMoveNext"),
+        "<cmd>BufferLineMoveNext<cr>",
         { desc = "Move buffer to next" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<leader>,",
-        keymap.exec("BufferLineMovePrev"),
+        "<cmd>BufferLineMovePrev<cr>",
         { desc = "Move buffer to previous" }
     ),
 }
@@ -42,14 +42,12 @@ local M = {
 for i = 1, 9 do
     table.insert(
         M,
-        keymap.set_lazy_key(
+        set_lazy_key(
             "n",
             string.format("<leader>%d", i),
-            keymap.exec(
-                string.format(
-                    "lua require('bufferline').go_to_buffer(%d, true)",
-                    i
-                )
+            string.format(
+                "<cmd>lua require('bufferline').go_to_buffer(%d, true)<cr>",
+                i
             ),
             { desc = string.format("Go to buffer-%d", i) }
         )
diff --git a/lua/configs/folke/trouble-nvim/keys.lua b/lua/configs/folke/trouble-nvim/keys.lua
index 86481696..0b7c9d8d 100644
--- a/lua/configs/folke/trouble-nvim/keys.lua
+++ b/lua/configs/folke/trouble-nvim/keys.lua
@@ -1,10 +1,10 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 
 local M = {
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<leader>tb",
-        keymap.exec("TroubleToggle"),
+        "<cmd>TroubleToggle<cr>",
         { desc = "Toggle trouble (diagnostics)" }
     ),
 }
diff --git a/lua/configs/gbprod/yanky-nvim/keys.lua b/lua/configs/gbprod/yanky-nvim/keys.lua
index 47bb5739..26403597 100644
--- a/lua/configs/gbprod/yanky-nvim/keys.lua
+++ b/lua/configs/gbprod/yanky-nvim/keys.lua
@@ -1,45 +1,38 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 
 local M = {
     -- put
-    keymap.set_lazy_key(
+    set_lazy_key(
         { "n", "x" },
         "p",
         "<Plug>(YankyPutAfter)",
         { desc = "Put after cursor (yanky)" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         { "n", "x" },
         "P",
         "<Plug>(YankyPutBefore)",
         { desc = "Put before cursor (yanky)" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         { "n", "x" },
         "gp",
         "<Plug>(YankyGPutAfter)",
         { desc = "Put after cursor and leave the cursor after (yanky)" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         { "n", "x" },
         "gP",
         "<Plug>(YankyGPutBefore)",
         { desc = "Put before cursor and leave the cursor after (yanky)" }
     ),
     -- yank
-    keymap.set_lazy_key(
+    set_lazy_key(
         { "n", "x" },
         "y",
         "<Plug>(YankyYank)",
         { desc = "Yank (yanky)" }
     ),
-    -- history
-    keymap.set_lazy_key(
-        "n",
-        "<leader>yh",
-        keymap.exec("YankyRingHistory"),
-        { desc = "Yank ring history" }
-    ),
 }
 
 return M
diff --git a/lua/configs/linrongbin16/fzfx-nvim/keys.lua b/lua/configs/linrongbin16/fzfx-nvim/keys.lua
index 6f3e9057..1fde5d20 100644
--- a/lua/configs/linrongbin16/fzfx-nvim/keys.lua
+++ b/lua/configs/linrongbin16/fzfx-nvim/keys.lua
@@ -1,115 +1,115 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 
 local M = {
     -- find files
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>f",
-        keymap.exec("FzfxFiles"),
+        "<cmd>FzfxFiles<cr>",
         { desc = "Find files" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "x",
         "<space>f",
-        keymap.exec("FzfxFilesV"),
+        "<cmd>FzfxFilesV<cr>",
         { desc = "Find files" }
     ),
     -- find files by cursor word
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>wf",
-        keymap.exec("FzfxFilesW"),
+        "<cmd>FzfxFilesW<cr>",
         { desc = "Find files by cursor word" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>pf",
-        keymap.exec("FzfxFilesP"),
+        "<cmd>FzfxFilesP<cr>",
         { desc = "Find files by yank text" }
     ),
     -- search buffer
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>bf",
-        keymap.exec("FzfxBuffers"),
+        "<cmd>FzfxBuffers<cr>",
         { desc = "Search buffers" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "x",
         "<space>bf",
-        keymap.exec("FzfxBuffersV"),
+        "<cmd>FzfxBuffersV<cr>",
         { desc = "Search buffers" }
     ),
     -- live grep
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>l",
-        keymap.exec("FzfxLiveGrep"),
+        "<cmd>FzfxLiveGrep<cr>",
         { desc = "Live grep" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "x",
         "<space>l",
-        keymap.exec("FzfxLiveGrepV"),
+        "<cmd>FzfxLiveGrepV<cr>",
         { desc = "Live grep" }
     ),
     -- search word
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>wl",
-        keymap.exec("FzfxLiveGrepW"),
+        "<cmd>FzfxLiveGrepW<cr>",
         { desc = "Live grep by cursor word" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>pl",
-        keymap.exec("FzfxLiveGrepP"),
+        "<cmd>FzfxLiveGrepP<cr>",
         { desc = "Live grep by yank text" }
     ),
     -- git
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>gf",
-        keymap.exec("FzfxGFiles"),
+        "<cmd>FzfxGFiles<cr>",
         { desc = "Search git files" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>br",
-        keymap.exec("FzfxGBranches"),
+        "<cmd>FzfxGBranches<cr>",
         { desc = "Search git branches" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>gc",
-        keymap.exec("FzfxGCommits"),
+        "<cmd>FzfxGCommits<cr>",
         { desc = "Search git commits" }
     ),
     -- vim commands
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>cm",
-        keymap.exec("FzfxCommands"),
+        "<cmd>FzfxCommands<cr>",
         { desc = "Search vim commands" }
     ),
     -- diagnostics
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>dg",
-        keymap.exec("FzfxLspDiagnostics"),
+        "<cmd>FzfxLspDiagnostics<cr>",
         { desc = "Search lsp diagnostics" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "x",
         "<space>dg",
-        keymap.exec("FzfxLspDiagnosticsV"),
+        "<cmd>FzfxLspDiagnosticsV<cr>",
         { desc = "Search lsp diagnostics" }
     ),
     -- file explorer
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<space>xp",
-        keymap.exec("FzfxFileExplorer"),
+        "<cmd>FzfxFileExplorer<cr>",
         { desc = "File Explorer" }
     ),
 }
diff --git a/lua/configs/moll/vim-bbye/keys.lua b/lua/configs/moll/vim-bbye/keys.lua
index 8e046716..27d1d79f 100644
--- a/lua/configs/moll/vim-bbye/keys.lua
+++ b/lua/configs/moll/vim-bbye/keys.lua
@@ -1,16 +1,16 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 
 local M = {
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<leader>bd",
-        keymap.exec("Bdelete"),
+        "<cmd>Bdelete<cr>",
         { desc = "Close buffer" }
     ),
-    keymap.set_lazy_key(
+    set_lazy_key(
         "n",
         "<leader>bD",
-        keymap.exec("Bdelete!"),
+        "<cmd>Bdelete!<cr>",
         { desc = "Close buffer forcibly!" }
     ),
 }
diff --git a/lua/configs/nvim-telescope/telescope-nvim/keys.lua b/lua/configs/nvim-telescope/telescope-nvim/keys.lua
index aa921cff..84a944da 100644
--- a/lua/configs/nvim-telescope/telescope-nvim/keys.lua
+++ b/lua/configs/nvim-telescope/telescope-nvim/keys.lua
@@ -1,199 +1,99 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 local FIND = vim.fn.executable("fdfind") > 0 and "fdfind" or "fd"
 
 local M = {
     -- search files
-    keymap.set_lazy_key(
-        "n",
-        "<space>f",
-        keymap.exec(function()
-            require("telescope.builtin").find_files({
-                find_command = {
-                    FIND,
-                    "-cnever", -- --color=never
-                    "-tf", -- --type file
-                    "-tl", -- --type symlink
-                    "-L", -- --follow
-                    "-i", -- --ignore-case
-                },
-            })
-        end),
-        { desc = "Search files" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>uf",
-        keymap.exec(function()
-            require("telescope.builtin").find_files({
-                find_command = {
-                    FIND,
-                    "-cnever", -- --color=never
-                    "-tf", -- --type file
-                    "-tl", -- --type symlink
-                    "-L", -- --follow
-                    "-i", -- --ignore-case
-                    "-u", -- --unrestricted (--hidden --no-ignore)
-                },
-            })
-        end),
-        { desc = "Unrestricted search files" }
-    ),
+    set_lazy_key("n", "<space>f", function()
+        require("telescope.builtin").find_files({
+            find_command = {
+                FIND,
+                "-cnever", -- --color=never
+                "-tf", -- --type file
+                "-tl", -- --type symlink
+                "-L", -- --follow
+                "-i", -- --ignore-case
+            },
+        })
+    end, { desc = "Search files" }),
+    set_lazy_key("n", "<space>uf", function()
+        require("telescope.builtin").find_files({
+            find_command = {
+                FIND,
+                "-cnever", -- --color=never
+                "-tf", -- --type file
+                "-tl", -- --type symlink
+                "-L", -- --follow
+                "-i", -- --ignore-case
+                "-u", -- --unrestricted (--hidden --no-ignore)
+            },
+        })
+    end, { desc = "Unrestricted search files" }),
     -- search buffers
-    keymap.set_lazy_key(
-        "n",
-        "<space>b",
-        keymap.exec(function()
-            require("telescope.builtin").buffers()
-        end),
-        { desc = "Search buffers" }
-    ),
+    set_lazy_key("n", "<space>b", function()
+        require("telescope.builtin").buffers()
+    end, { desc = "Search buffers" }),
     -- live grep
-    keymap.set_lazy_key(
-        "n",
-        "<space>l",
-        keymap.exec(function()
-            require("telescope").extensions.live_grep_args.live_grep_args()
-        end),
-        { desc = "Live grep" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>ul",
-        keymap.exec(function()
-            require("telescope").extensions.live_grep_args.live_grep_args({
-                additional_args = { "-uu" }, -- --unrestricted (--hidden --no-ignore)
-            })
-        end),
-        { desc = "Unrestricted live grep" }
-    ),
+    set_lazy_key("n", "<space>l", function()
+        require("telescope").extensions.live_grep_args.live_grep_args()
+    end, { desc = "Live grep" }),
+    set_lazy_key("n", "<space>ul", function()
+        require("telescope").extensions.live_grep_args.live_grep_args({
+            additional_args = { "-uu" }, -- --unrestricted (--hidden --no-ignore)
+        })
+    end, { desc = "Unrestricted live grep" }),
     -- search word
-    keymap.set_lazy_key(
-        "n",
-        "<space>w",
-        keymap.exec(function()
-            require("telescope.builtin").grep_string()
-        end),
-        { desc = "Search word under cursor" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>uw",
-        keymap.exec(function()
-            require("telescope.builtin").grep_string({
-                additional_args = { "-uu" }, -- --unrestricted (--hidden --no-ignore)
-            })
-        end),
-        { desc = "Unrestricted search word under cursor" }
-    ),
+    set_lazy_key("n", "<space>w", function()
+        require("telescope.builtin").grep_string()
+    end, { desc = "Search word under cursor" }),
+    set_lazy_key("n", "<space>uw", function()
+        require("telescope.builtin").grep_string({
+            additional_args = { "-uu" }, -- --unrestricted (--hidden --no-ignore)
+        })
+    end, { desc = "Unrestricted search word under cursor" }),
     -- search git
-    keymap.set_lazy_key(
-        "n",
-        "<space>gf",
-        keymap.exec(function()
-            require("telescope.builtin").git_files()
-        end),
-        { desc = "Search git files" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>gc",
-        keymap.exec(function()
-            require("telescope.builtin").git_commits()
-        end),
-        { desc = "Search git commits" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>gb",
-        keymap.exec(function()
-            require("telescope.builtin").git_branches()
-        end),
-        { desc = "Search git branches" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>gs",
-        keymap.exec(function()
-            require("telescope.builtin").git_status()
-        end),
-        { desc = "Search git status" }
-    ),
+    set_lazy_key("n", "<space>gf", function()
+        require("telescope.builtin").git_files()
+    end, { desc = "Search git files" }),
+    set_lazy_key("n", "<space>gc", function()
+        require("telescope.builtin").git_commits()
+    end, { desc = "Search git commits" }),
+    set_lazy_key("n", "<space>gb", function()
+        require("telescope.builtin").git_branches()
+    end, { desc = "Search git branches" }),
+    set_lazy_key("n", "<space>gs", function()
+        require("telescope.builtin").git_status()
+    end, { desc = "Search git status" }),
     -- search diagnostics
-    keymap.set_lazy_key(
-        "n",
-        "<space>dw",
-        keymap.exec(function()
-            require("telescope.builtin").diagnostics()
-        end),
-        { desc = "Search workspace diagnostics" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>dd",
-        keymap.exec(function()
-            require("telescope.builtin").diagnostics({
-                bufnr = 0,
-            })
-        end),
-        { desc = "Search document diagnostics" }
-    ),
+    set_lazy_key("n", "<space>dw", function()
+        require("telescope.builtin").diagnostics()
+    end, { desc = "Search workspace diagnostics" }),
+    set_lazy_key("n", "<space>dd", function()
+        require("telescope.builtin").diagnostics({
+            bufnr = 0,
+        })
+    end, { desc = "Search document diagnostics" }),
     -- search vim
-    keymap.set_lazy_key(
-        "n",
-        "<space>cm",
-        keymap.exec(function()
-            require("telescope.builtin").commands()
-        end),
-        { desc = "Search vim commands" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>tg",
-        keymap.exec(function()
-            require("telescope.builtin").tags()
-        end),
-        { desc = "Search vim tags" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>ch",
-        keymap.exec(function()
-            require("telescope.builtin").command_history()
-        end),
-        { desc = "Search vim command history" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>sh",
-        keymap.exec(function()
-            require("telescope.builtin").search_history()
-        end),
-        { desc = "Search vim search history" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>mk",
-        keymap.exec(function()
-            require("telescope.builtin").marks()
-        end),
-        { desc = "Search vim marks" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>km",
-        keymap.exec(function()
-            require("telescope.builtin").keymaps()
-        end),
-        { desc = "Search vim key mappings" }
-    ),
-    keymap.set_lazy_key(
-        "n",
-        "<space>ud",
-        keymap.exec(function()
-            require("telescope").extensions.undo.undo()
-        end),
-        { desc = "Search vim undo tree" }
-    ),
+    set_lazy_key("n", "<space>cm", function()
+        require("telescope.builtin").commands()
+    end, { desc = "Search vim commands" }),
+    set_lazy_key("n", "<space>tg", function()
+        require("telescope.builtin").tags()
+    end, { desc = "Search vim tags" }),
+    set_lazy_key("n", "<space>ch", function()
+        require("telescope.builtin").command_history()
+    end, { desc = "Search vim command history" }),
+    set_lazy_key("n", "<space>sh", function()
+        require("telescope.builtin").search_history()
+    end, { desc = "Search vim search history" }),
+    set_lazy_key("n", "<space>mk", function()
+        require("telescope.builtin").marks()
+    end, { desc = "Search vim marks" }),
+    set_lazy_key("n", "<space>km", function()
+        require("telescope.builtin").keymaps()
+    end, { desc = "Search vim key mappings" }),
+    set_lazy_key("n", "<space>ud", function()
+        require("telescope").extensions.undo.undo()
+    end, { desc = "Search vim undo tree" }),
 }
 
 return M
diff --git a/lua/configs/stevearc/oil-nvim/keys.lua b/lua/configs/stevearc/oil-nvim/keys.lua
index 4ac9c7d1..e824e638 100644
--- a/lua/configs/stevearc/oil-nvim/keys.lua
+++ b/lua/configs/stevearc/oil-nvim/keys.lua
@@ -1,14 +1,9 @@
-local keymap = require("builtin.utils.keymap")
+local set_lazy_key = require("builtin.utils.keymap").set_lazy_key
 
 local M = {
-    keymap.set_lazy_key(
-        "n",
-        "<leader>ol",
-        keymap.exec(function()
-            require("oil").open()
-        end),
-        { desc = "Open oil file manager" }
-    ),
+    set_lazy_key("n", "<leader>ol", function()
+        require("oil").open()
+    end, { desc = "Open oil file manager" }),
 }
 
 return M
diff --git a/lua/configs/stevearc/stickybuf-nvim/config.lua b/lua/configs/stevearc/stickybuf-nvim/config.lua
new file mode 100644
index 00000000..94b3368a
--- /dev/null
+++ b/lua/configs/stevearc/stickybuf-nvim/config.lua
@@ -0,0 +1 @@
+require("stickybuf").setup()
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 9cf40f8a..6c222625 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -159,6 +159,11 @@ local M = {
         dependencies = { "junegunn/fzf" },
         config = lua_config("stevearc/dressing.nvim"),
     },
+    {
+        "stevearc/stickybuf.nvim",
+        event = { UIEnter },
+        config = lua_config("stevearc/stickybuf.nvim"),
+    },
 
     -- ---- SEARCH ----