diff --git a/init.lua b/init.lua index e5cd800e..377fd947 100644 --- a/init.lua +++ b/init.lua @@ -430,20 +430,20 @@ require('lazy').setup({ ['ui-select'] = { require('telescope.themes').get_dropdown(), }, - ['media_files'] = { - -- filetypes whitelist - -- defaults to {"png", "jpg", "mp4", "webm", "pdf"} - filetypes = {"png", "webp", "jpg", "jpeg"}, - -- find command (defaults to `fd`) - find_cmd = "rg" - } + -- ['media_files'] = { + -- -- filetypes whitelist + -- -- defaults to {"png", "jpg", "mp4", "webm", "pdf"} + -- filetypes = {"png", "webp", "jpg", "jpeg"}, + -- -- find command (defaults to `fd`) + -- find_cmd = "rg" + -- } }, } -- Enable Telescope extensions if they are installed pcall(require('telescope').load_extension, 'fzf') pcall(require('telescope').load_extension, 'ui-select') - pcall(require('telescope').load_extension, 'media-files') + -- pcall(require('telescope').load_extension, 'media-files') -- See `:help telescope.builtin` local builtin = require 'telescope.builtin' diff --git a/lua/custom/core/keymaps.lua b/lua/custom/core/keymaps.lua index e88a6c8d..5ee8f5ff 100644 --- a/lua/custom/core/keymaps.lua +++ b/lua/custom/core/keymaps.lua @@ -42,6 +42,8 @@ keymap.set('n', 'dd', '"_dd') -- duplicate line not passing deleted line to regi keymap.set('n', '', 'ggVG') -- select-all keymap.set('n', 'J', '5j') keymap.set('n', 'K', '5k') +keymap.set('v', 'J', '5j') +keymap.set('v', 'K', '5k') keymap.set('n', 'rr', ':e!') -- revert file keymap.set('n', 'w', ':w') -- saves file @@ -66,7 +68,7 @@ keymap.set('n', '', ':BookmarkToggle') keymap.set("n", "sm", ":MaximizerToggle") -- toggle split window maximization -- nvim-tree -keymap.set("n", "e", ":NvimTreeToggle") -- toggle file explorer +-- keymap.set("n", "e", ":NvimTreeToggle") -- toggle file explorer // todo -- telescope keymap.set("n", "ff", "Telescope find_files") -- find files within current working directory, respects .gitignore @@ -109,3 +111,6 @@ keymap.set("n", "2", function() require("harpoon.ui").nav_file(2) end, o keymap.set("n", "3", function() require("harpoon.ui").nav_file(3) end, opts) keymap.set("n", "4", function() require("harpoon.ui").nav_file(4) end, opts) +-- undotree +keymap.set("n", "", ":UndotreeToggle") + diff --git a/lua/custom/plugins/flash.lua b/lua/custom/plugins/flash.lua new file mode 100644 index 00000000..393ce443 --- /dev/null +++ b/lua/custom/plugins/flash.lua @@ -0,0 +1,24 @@ +return { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + opts = { + jump = { + autojump = true, + }, + modes = { + char = { + jump_labels = true, + multi_line = false, + } + } + }, + -- stylua: ignore + keys = { + { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "S", mode = { "n" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, + { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, + { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, + { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + }, + } \ No newline at end of file diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 3154a0a4..83f7feb3 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -24,5 +24,7 @@ return { 'tpope/vim-unimpaired', -- vim-unimpared -- 'nvim-telescope/telescope-media-files.nvim', -- doesnt work for windows 'nvim-telescope/telescope-file-browser.nvim', + 'RRethy/vim-illuminate', + 'mbbill/undotree', }