From cb6ad4da32d75b22ee6acdbbdfff18560579aa36 Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Tue, 29 Aug 2023 11:58:32 +0300
Subject: [PATCH] Migrate from leap.nvim to flash.nvim

---
 dotfiles/neovim/lazy-lock.json           |  6 ++---
 dotfiles/neovim/lua/my/plugins/flash.lua | 29 ++++++++++++++++++++++++
 dotfiles/neovim/lua/my/plugins/leap.lua  | 15 ------------
 3 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 dotfiles/neovim/lua/my/plugins/flash.lua
 delete mode 100644 dotfiles/neovim/lua/my/plugins/leap.lua

diff --git a/dotfiles/neovim/lazy-lock.json b/dotfiles/neovim/lazy-lock.json
index 855d4a0..b078cbd 100644
--- a/dotfiles/neovim/lazy-lock.json
+++ b/dotfiles/neovim/lazy-lock.json
@@ -2,7 +2,6 @@
   "LuaSnip": { "branch": "master", "commit": "409535b8fc54c650eb845b0c35e0cc7f08810284" },
   "abbreinder.nvim": { "branch": "main", "commit": "5b2b5ff08a9ada42238d733aeebc6d3d96314d77" },
   "abbremand.nvim": { "branch": "main", "commit": "d633341f632b0b2666dfc6dfe6b9842ba1610a1d" },
-  "bluloco.nvim": { "branch": "main", "commit": "27ad647f0fc3270e732add1533ad9bcbf702f24e" },
   "clipboard-image.nvim": { "branch": "main", "commit": "af8fdaad7e6fed0741e18dbf2f57bdc7494adaee" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
@@ -15,6 +14,7 @@
   "dhall-vim": { "branch": "master", "commit": "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae" },
   "dressing.nvim": { "branch": "master", "commit": "6bde51adabba06f7fd4a469885a85f36d78a5f52" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" },
   "github-actions-yaml.vim": { "branch": "master", "commit": "f2f16243447cea174daa6b4a9ffd3ff9213814ef" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
   "glow.nvim": { "branch": "main", "commit": "8942dfb05794f436af4fbc90a34393f1fd36f361" },
@@ -30,10 +30,8 @@
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
   "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
   "lean.nvim": { "branch": "main", "commit": "67580fab5bed73920fa3fdd712fc8e805c389c3d" },
-  "leap": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
-  "lush.nvim": { "branch": "main", "commit": "a8f0f7b9f837887f13a61d67b40ae26188fe4d62" },
   "magma-nvim": { "branch": "main", "commit": "ff3deba8a879806a51c005e50782130246143d06" },
   "mind.nvim": { "branch": "master", "commit": "002137dd7cf97865ebd01b6a260209d2daf2da66" },
   "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },
@@ -63,7 +61,7 @@
   "smart-splits.nvim": { "branch": "master", "commit": "7aad6019dee974a01333523a5b8e122b7e7da454" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
-  "telescope.nvim": { "branch": "master", "commit": "e960efa60e97df58e089b00270f09d60f27202c8" },
+  "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
   "typst.vim": { "branch": "main", "commit": "6a99324a138c2da69589a8ab2e49375774e43d77" },
   "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
   "venn.nvim": { "branch": "main", "commit": "c114563960b8fb1197695d42798d1f3e7190b798" },
diff --git a/dotfiles/neovim/lua/my/plugins/flash.lua b/dotfiles/neovim/lua/my/plugins/flash.lua
new file mode 100644
index 0000000..e2b027a
--- /dev/null
+++ b/dotfiles/neovim/lua/my/plugins/flash.lua
@@ -0,0 +1,29 @@
+local function keybind(keys, action, desc, modes)
+  if modes == nil then
+    modes = { "n", "x", "o" }
+  end
+
+  return {
+    keys,
+    mode = modes,
+    function()
+      require("flash")[action]()
+    end,
+    desc = desc,
+  }
+end
+
+local M = {
+  "folke/flash.nvim",
+  ---@type Flash.Config
+  opts = {},
+  keys = {
+    keybind("s", "jump", "Flash"),
+    keybind("S", "treesitter", "Flash Treesitter"),
+    keybind("r", "remote", "Remote Flash", { "o" }),
+    keybind("R", "treesitter_search", "Treesitter Search", { "o", "x" }),
+    keybind("<C-S>", "toggle", "Toggle Flash Search", { "c" }),
+  },
+}
+
+return M
diff --git a/dotfiles/neovim/lua/my/plugins/leap.lua b/dotfiles/neovim/lua/my/plugins/leap.lua
deleted file mode 100644
index ca6c8af..0000000
--- a/dotfiles/neovim/lua/my/plugins/leap.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local M = {
-  -- removes the need for spamming w or e
-  "ggandor/leap.nvim",
-  name = "leap",
-  event = "VeryLazy"
-}
-
-function M.config()
-  require("leap").add_default_mappings()
-end
-
--- (something)
--- something
-
-return M