diff --git a/lazy-lock.json b/lazy-lock.json index bacc020..d9eb28a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,6 +2,7 @@ "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, "conform.nvim": { "branch": "master", "commit": "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "fzf-lua": { "branch": "main", "commit": "8adf950093af5361621cf52208d64995b1af78b5" }, "gitsigns.nvim": { "branch": "main", "commit": "ee0606259ee5d5dd40398be26755048e8965086e" }, "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index 167cdf1..5dbb130 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -3,7 +3,7 @@ local not_enabled_filetype = { "markdown" } ---@module 'blink.cmp' ---@type blink.cmp.Config local opts = { - keymap = { preset = "default" }, + keymap = { preset = "super-tab" }, completion = { documentation = { auto_show = true, diff --git a/lua/plugins/fzf.lua b/lua/plugins/fzf.lua new file mode 100644 index 0000000..aed45dd --- /dev/null +++ b/lua/plugins/fzf.lua @@ -0,0 +1,23 @@ +return { + { + "ibhagwan/fzf-lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = {}, + config = function() + local fzf_lua = require("fzf-lua") + + vim.keymap.set("n", "", fzf_lua.files, {}) + vim.keymap.set("n", "", function() + fzf_lua.diagnostics_workspace({ multiline = false }) + end, {}) + vim.keymap.set("n","fg",fzf_lua.live_grep,{}) + + vim.keymap.set("n", "rg", fzf_lua.registers, {}) + vim.keymap.set("n", "gs", fzf_lua.git_status, {}) + + vim.keymap.set("n", "qf", fzf_lua.quickfix, {}) + + vim.keymap.set({ "n", "v" }, "ca", fzf_lua.lsp_code_actions, {}) + end, + }, +} diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 008222a..419e5f4 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -1,7 +1,10 @@ return { "neovim/nvim-lspconfig", --- cond = not require("commons").tools.is_version_gte_0_11(), + -- cond = not require("commons").tools.is_version_gte_0_11(), dependencies = { { "saghen/blink.cmp" } }, - config = function() - end, + key = { + { "gd", vim.lsp.buf.definition, { "n" }, desc = "Go to definition" }, + { "gD", vim.lsp.buf.declaration, { "n" }, desc = "Go to declaration" }, + }, + config = function() end, }