diff --git a/lazy-lock.json b/lazy-lock.json index 4394571..5aa5070 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,23 +1,23 @@ { - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, - "nvim-treesitter": { "branch": "master", "commit": "176e4464736c1feca190d77f481ed5972b513516" }, - "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "97b8238fb6f1dd2b7d4168ee10457c277c9e6ee3" }, + "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, + "nvim-lspconfig": { "branch": "master", "commit": "b1729954329236f59d075bec79fdee7a6f3ce88b" }, + "nvim-treesitter": { "branch": "master", "commit": "5874cac1b76c97ebb3fc03225bd7215d4e671cd2" }, + "nvim-treesitter-context": { "branch": "master", "commit": "8fd989b6b457a448606b4a2e51f9161700f609a7" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "dc788723f717bdd3041838b8db34cce53c9aa920" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "vim": { "branch": "main", "commit": "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295" }, - "vim-airline": { "branch": "master", "commit": "d25c049e617775eb2eb26c580e5dec591c94d480" }, + "vim-airline": { "branch": "master", "commit": "7a552f415c48aed33bf7eaa3c50e78504d417913" }, "vim-airline-themes": { "branch": "master", "commit": "a9aa25ce323b2dd04a52706f4d1b044f4feb7617" }, "vim-better-whitespace": { "branch": "master", "commit": "86a0579b330b133b8181b8e088943e81c26a809e" }, - "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, - "vim-go": { "branch": "master", "commit": "a64d097a1af1772c24d13f34529b9be2a34b7721" }, + "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" }, + "vim-go": { "branch": "master", "commit": "ec7a59ef10d417c0cc1cd571a165c7c9dec30d27" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } -} \ No newline at end of file +} diff --git a/lua/troy0820/lazy/lsp.lua b/lua/troy0820/lazy/lsp.lua index 94be261..956f451 100644 --- a/lua/troy0820/lazy/lsp.lua +++ b/lua/troy0820/lazy/lsp.lua @@ -1,47 +1,46 @@ return { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v3.x', - dependencies = { - --- Uncomment the two plugins below if you want to manage the language servers from neovim - {'williamboman/mason.nvim'}, - {'williamboman/mason-lspconfig.nvim'}, + 'VonHeikemen/lsp-zero.nvim', + branch = 'v3.x', + dependencies = { + --- Uncomment the two plugins below if you want to manage the language servers from neovim + { 'williamboman/mason.nvim' }, + { 'williamboman/mason-lspconfig.nvim' }, - {'neovim/nvim-lspconfig'}, - {'hrsh7th/nvim-cmp'}, - {'hrsh7th/cmp-nvim-lsp'}, - {'hrsh7th/cmp-nvim-lsp-signature-help'}, - {'L3MON4D3/LuaSnip'}, - }, -config = function() - local lsp_zero = require('lsp-zero') + { 'neovim/nvim-lspconfig' }, + { 'hrsh7th/nvim-cmp' }, + { 'hrsh7th/cmp-nvim-lsp' }, + { 'hrsh7th/cmp-nvim-lsp-signature-help' }, + }, + config = function() + local lsp_zero = require('lsp-zero') - lsp_zero.on_attach(function(client, bufnr) - lsp_zero.default_keymaps({buffer = bufnr}) - end) + lsp_zero.on_attach(function(client, bufnr) + lsp_zero.default_keymaps({ buffer = bufnr }) + end) - require('mason').setup({}) - require('mason-lspconfig').setup({ - handlers = { - function(server_name) - require('lspconfig')[server_name].setup({}) --lsp_zero.default_setup, - end - }, - }) + require('mason').setup({}) + require('mason-lspconfig').setup({ + handlers = { + function(server_name) + require('lspconfig')[server_name].setup({}) --lsp_zero.default_setup, + end + }, + }) - local cmp = require('cmp') - local cmp_action = require('lsp-zero').cmp_action() + local cmp = require('cmp') + local cmp_action = require('lsp-zero').cmp_action() - cmp.setup({ - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'nvim_lsp_signature_help' } + cmp.setup({ + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'nvim_lsp_signature_help' } - }), - mapping = cmp.mapping.preset.insert({ - [''] = cmp_action.tab_complete(), - [''] = cmp_action.select_prev_or_fallback(), - }), - }) -end + }), + mapping = cmp.mapping.preset.insert({ + [''] = cmp_action.tab_complete(), + [''] = cmp_action.select_prev_or_fallback(), + }), + }) + end } diff --git a/lua/troy0820/lazy/telescope.lua b/lua/troy0820/lazy/telescope.lua index 7a6e25d..2e9c7be 100644 --- a/lua/troy0820/lazy/telescope.lua +++ b/lua/troy0820/lazy/telescope.lua @@ -1,14 +1,25 @@ return { - 'nvim-telescope/telescope.nvim', tag = '0.1.6', - dependencies = {"nvim-lua/plenary.nvim"}, + 'nvim-telescope/telescope.nvim', + tag = '0.1.6', + dependencies = { + "nvim-lua/plenary.nvim", + 'nvim-telescope/telescope-fzf-native.nvim', + build = 'make' + }, config = function() - local builtin = require('telescope.builtin') - vim.keymap.set('n', 'p', builtin.find_files, {}) - vim.keymap.set('n', '', builtin.git_files, {}) - vim.keymap.set('n', 'ag', function () - builtin.grep_string({ search = vim.fn.input("Grep > " ) }); -end) + require('telescope').setup { + extensions = { + fzf = {} + }, + } + require('telescope').load_extension('fzf') + local builtin = require('telescope.builtin') + vim.keymap.set('n', 'p', builtin.find_files, {}) + vim.keymap.set('n', '', builtin.git_files, {}) + vim.keymap.set('n', 'ag', function() + builtin.grep_string({ search = vim.fn.input("Grep > ") }); + end) end }