diff --git a/init.lua b/init.lua index c874d6a..a244598 100644 --- a/init.lua +++ b/init.lua @@ -25,13 +25,7 @@ local ts = require("ts") require("pack").setup({ "https://github.com/navarasu/onedark.nvim", "https://github.com/nvim-lua/plenary.nvim", - "https://github.com/rcarriga/nvim-notify", - "https://github.com/debugloop/telescope-undo.nvim", - { - "https://github.com/nvim-telescope/telescope-fzf-native.nvim", - build = { "make" }, - }, - "https://github.com/nvim-telescope/telescope.nvim", + "https://github.com/ibhagwan/fzf-lua", { "https://github.com/saghen/blink.cmp", version = vim.version.range("^1"), diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index fed0b40..f389dc5 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -173,7 +173,8 @@ vim.keymap.set({ "n", "i" }, "", function() vim.schedule(vim.cmd.diffupdate) return "" end, { expr = true }) -vim.keymap.set("n", "dl", vim.diagnostic.setloclist) +vim.keymap.set("n", "fd", vim.diagnostic.setloclist) +vim.keymap.set("n", "fD", vim.diagnostic.setqflist) vim.keymap.set("n", "grt", vim.lsp.buf.type_definition) vim.keymap.set("n", "gd", vim.lsp.buf.definition) diff --git a/lua/plugins/fzf-lua.lua b/lua/plugins/fzf-lua.lua new file mode 100644 index 0000000..8d7e1e1 --- /dev/null +++ b/lua/plugins/fzf-lua.lua @@ -0,0 +1,58 @@ +local fzf = require("fzf-lua") + +local wide = { + width = 160, + height = 30, + preview = { horizontal = "right:50%" }, +} + +fzf.setup({ + winopts = { + width = 80, + height = 30, + row = 0.5, + col = 0.5, + backdrop = 100, + }, + keymap = { + builtin = { + false, + [""] = "toggle-fullscreen", + }, + fzf = { + false, + ["ctrl-q"] = "select-all+accept", + }, + }, + files = { + hidden = true, + no_ignore = true, + previewer = false, + }, + grep = { + hidden = true, + rg_opts = "--iglob=!.venv --iglob=!vendor " + .. require("fzf-lua.defaults").defaults.grep.rg_opts, + winopts = wide, + }, + oldfiles = { + cwd_only = true, + previewer = false, + }, + buffers = { + sort_lastused = true, + previewer = false, + }, + highlights = { + winopts = wide, + }, +}) + +vim.keymap.set("n", "ff", fzf.files) +vim.keymap.set("n", "fr", fzf.oldfiles) +vim.keymap.set("n", "fg", fzf.live_grep) +vim.keymap.set("n", "fG", function() + fzf.live_grep({ cwd = vim.fn.expand("%:p:h") }) +end) +vim.keymap.set("n", "fb", fzf.buffers) +vim.keymap.set("n", "fh", fzf.highlights) diff --git a/lua/plugins/nvim-notify.lua b/lua/plugins/nvim-notify.lua deleted file mode 100644 index 2918b65..0000000 --- a/lua/plugins/nvim-notify.lua +++ /dev/null @@ -1,8 +0,0 @@ -local notify = require("notify") -notify.setup({ - render = "default", - stages = "static", - merge_duplicates = true, -}) - -vim.notify = notify diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index 3923bc1..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,181 +0,0 @@ -local actions = require("telescope.actions") -local builtin = require("telescope.builtin") -local telescope = require("telescope") -local utils = require("telescope.utils") - -telescope.setup({ - defaults = { - mappings = { - n = { - q = actions.close, - [""] = actions.close, - [""] = actions.select_default, - [""] = actions.results_scrolling_up, - [""] = actions.results_scrolling_down, - }, - }, - file_ignore_patterns = { - "^%.git/", - }, - layout_config = { - height = 30, - width = 80, - scroll_speed = 3, - }, - }, - extensions = { - undo = { - mappings = { - i = { - [""] = require("telescope-undo.actions").yank_deletions, - [""] = false, - [""] = false, - [""] = require("telescope-undo.actions").yank_additions, - }, - n = { - ["u"] = false, - }, - }, - }, - }, - pickers = { - oldfiles = { - initial_mode = "normal", - }, - buffers = { - initial_mode = "normal", - mappings = { - n = { - [""] = actions.delete_buffer, - }, - }, - }, - live_grep = { - layout_config = { - width = 160, - preview_width = 80, - }, - }, - highlights = { - layout_config = { - width = 160, - preview_width = 80, - }, - }, - diagnostics = { - initial_mode = "normal", - layout_config = { - width = 160, - preview_width = 80, - }, - }, - lsp_definitions = { - initial_mode = "normal", - layout_config = { - width = 160, - preview_width = 80, - }, - }, - lsp_type_definitions = { - initial_mode = "normal", - }, - lsp_implementations = { - initial_mode = "normal", - }, - lsp_references = { - initial_mode = "normal", - layout_config = { - width = 160, - preview_width = 80, - }, - }, - git_status = { - initial_mode = "normal", - }, - }, -}) - -vim.keymap.set("n", "ff", function() - builtin.find_files({ - hidden = true, - no_ignore = true, - no_ignore_parent = true, - previewer = false, - }) -end) - -vim.keymap.set("n", "fr", function() - builtin.oldfiles({ - only_cwd = true, - hidden = true, - previewer = false, - }) -end) - -vim.keymap.set("n", "fg", function() - builtin.live_grep({ - additional_args = function(_) - return { - "--hidden", - "--iglob=!.venv", - "--iglob=!vendor", - "--iglob=!.git", - } - end, - previewer = true, - }) -end) - -vim.keymap.set("n", "fG", function() - builtin.live_grep({ - additional_args = function(_) - return { - "--hidden", - "--iglob=!.venv", - "--iglob=!vendor", - "--iglob=!.git", - } - end, - cwd = utils.buffer_dir(), - previewer = true, - }) -end) - -vim.keymap.set("n", "fb", function() - builtin.buffers({ previewer = false, sort_mru = true }) -end) - -vim.keymap.set("n", "fd", function() - builtin.diagnostics({ - bufnr = 0, - }) -end) - -vim.keymap.set("n", "dl", builtin.diagnostics) -vim.keymap.set("n", "grt", builtin.lsp_type_definitions) -vim.keymap.set("n", "gd", builtin.lsp_definitions) -vim.keymap.set("n", "gri", builtin.lsp_implementations) -vim.keymap.set("n", "grr", builtin.lsp_references) - -telescope.load_extension("fzf") -telescope.load_extension("notify") -vim.keymap.set("n", "fn", function() - telescope.extensions.notify.notify({ - initial_mode = "normal", - layout_config = { - width = 160, - preview_width = 80, - }, - }) -end) - -telescope.load_extension("undo") -vim.keymap.set("n", "fu", function() - telescope.extensions.undo.undo({ - initial_mode = "normal", - layout_config = { - width = 160, - preview_width = 80, - }, - }) -end) diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index fbc52a8..9adca3f 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -9,6 +9,10 @@ "src": "https://github.com/saghen/blink.cmp", "version": "1.0.0 - 2.0.0" }, + "fzf-lua": { + "rev": "1e866cce085cc6df3d3e4fb59f00105fa84cef6c", + "src": "https://github.com/ibhagwan/fzf-lua" + }, "gitsigns.nvim": { "rev": "0d797daee85366bc242580e352a4f62d67557b84", "src": "https://github.com/lewis6991/gitsigns.nvim" @@ -33,10 +37,6 @@ "rev": "bedca8b426b2fee0ccac596d167d71bbe971253f", "src": "https://github.com/neovim/nvim-lspconfig" }, - "nvim-notify": { - "rev": "8701bece920b38ea289b457f902e2ad184131a5d", - "src": "https://github.com/rcarriga/nvim-notify" - }, "nvim-tree.lua": { "rev": "509962f21ab7289d8dcd28568af539be39a8c01e", "src": "https://github.com/nvim-tree/nvim-tree.lua" @@ -57,18 +57,6 @@ "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509", "src": "https://github.com/nvim-lua/plenary.nvim" }, - "telescope-fzf-native.nvim": { - "rev": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c", - "src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim" - }, - "telescope-undo.nvim": { - "rev": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5", - "src": "https://github.com/debugloop/telescope-undo.nvim" - }, - "telescope.nvim": { - "rev": "7ef4d6dccb78ee71e552bbd866176762ad328afa", - "src": "https://github.com/nvim-telescope/telescope.nvim" - }, "tree-sitter-bash": { "rev": "a06c2e4415e9bc0346c6b86d401879ffb44058f7", "src": "https://github.com/tree-sitter/tree-sitter-bash"