diff --git a/lazy-lock.json b/lazy-lock.json index 16fa640..f6951e7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -20,6 +20,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "fc56fc25cfc3dc3f24266508aa4a7096102eb6a6" }, "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, + "hop.nvim": { "branch": "master", "commit": "08ddca799089ab96a6d1763db0b8adc5320bf050" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, @@ -59,7 +60,6 @@ "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" }, "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, - "vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" }, "vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" }, "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, diff --git a/lua/plugins/disabled.lua b/lua/plugins/disabled.lua index 8a25e9f..eb8ceb7 100644 --- a/lua/plugins/disabled.lua +++ b/lua/plugins/disabled.lua @@ -1,6 +1,6 @@ return { - -- { - -- "folke/flash.nvim", - -- enabled = false, - -- }, + { + "folke/flash.nvim", + enabled = false, + }, } diff --git a/lua/plugins/easy-motion.lua b/lua/plugins/easy-motion.lua index 6eefe0d..c6f2810 100644 --- a/lua/plugins/easy-motion.lua +++ b/lua/plugins/easy-motion.lua @@ -1,30 +1,20 @@ return { - "folke/flash.nvim", - event = "VeryLazy", - opts = { - modes = { - char = { enabled = false }, -- Disable `f` and `t` enhancements - }, - }, + "smoka7/hop.nvim", + version = "*", + opts = {}, config = function() - vim.api.nvim_set_hl(0, "FlashMatch", { fg = "NONE", bg = "NONE", bold = true }) - vim.api.nvim_set_hl(0, "FlashCurrent", { fg = "#ffffff", bg = "NONE", bold = true }) - vim.api.nvim_set_hl(0, "FlashLabel", { fg = "#ffcc00", bg = "NONE", bold = true }) + local hop = require("hop") + hop.setup() + vim.api.nvim_set_hl(0, "HopNextKey", { fg = "#ffcc00", bold = true }) + vim.api.nvim_set_hl(0, "HopNextKey1", { fg = "#ff8800", bold = true }) + vim.api.nvim_set_hl(0, "HopNextKey2", { fg = "#ff4400" }) + + -- Define key mappings similar to EasyMotion + vim.keymap.set("n", "f", function() + require("hop").hint_char1({ + direction = require("hop.hint").HintDirection.AFTER_CURSOR, + current_line_only = false, + }) + end, { desc = "Jump to character (EasyMotion-like)" }) end, - keys = { - { - "f", - function() - require("flash").jump({ - search = { - forward = true, - wrap = true, - multi_window = false, - }, - }) - end, - mode = { "n", "x", "o" }, - desc = "Jump to character (EasyMotion)", - }, - }, }