|
|
@ -255,9 +255,9 @@ require("lazy").setup({
|
|
|
|
-- You can put your default mappings / updates / etc. in here
|
|
|
|
-- You can put your default mappings / updates / etc. in here
|
|
|
|
-- All the info you're looking for is in `:help telescope.setup()`
|
|
|
|
-- All the info you're looking for is in `:help telescope.setup()`
|
|
|
|
--
|
|
|
|
--
|
|
|
|
defaults = {
|
|
|
|
defaults = vim.tbl_extend("force", require("telescope.themes").get_ivy(), {
|
|
|
|
path_display = { "smart" },
|
|
|
|
path_display = { "smart" },
|
|
|
|
},
|
|
|
|
}),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
pcall(require("telescope").load_extension("live_grep_args"))
|
|
|
|
pcall(require("telescope").load_extension("live_grep_args"))
|
|
|
@ -377,6 +377,7 @@ require("lazy").setup({
|
|
|
|
local servers = {
|
|
|
|
local servers = {
|
|
|
|
clangd = {},
|
|
|
|
clangd = {},
|
|
|
|
-- gopls = {},
|
|
|
|
-- gopls = {},
|
|
|
|
|
|
|
|
jdtls = {},
|
|
|
|
pyright = {},
|
|
|
|
pyright = {},
|
|
|
|
rust_analyzer = {
|
|
|
|
rust_analyzer = {
|
|
|
|
settings = {
|
|
|
|
settings = {
|
|
|
@ -467,13 +468,34 @@ require("lazy").setup({
|
|
|
|
"hrsh7th/nvim-cmp",
|
|
|
|
"hrsh7th/nvim-cmp",
|
|
|
|
event = "InsertEnter",
|
|
|
|
event = "InsertEnter",
|
|
|
|
dependencies = {
|
|
|
|
dependencies = {
|
|
|
|
|
|
|
|
-- Snippet Engine & its associated nvim-cmp source
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
"L3MON4D3/LuaSnip",
|
|
|
|
|
|
|
|
build = (function()
|
|
|
|
|
|
|
|
-- Build Step is needed for regex support in snippets
|
|
|
|
|
|
|
|
-- This step is not supported in many windows environments
|
|
|
|
|
|
|
|
-- Remove the below condition to re-enable on windows
|
|
|
|
|
|
|
|
if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return "make install_jsregexp"
|
|
|
|
|
|
|
|
end)(),
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
"saadparwaiz1/cmp_luasnip",
|
|
|
|
"hrsh7th/cmp-nvim-lsp",
|
|
|
|
"hrsh7th/cmp-nvim-lsp",
|
|
|
|
"hrsh7th/cmp-path",
|
|
|
|
"hrsh7th/cmp-path",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
config = function()
|
|
|
|
config = function()
|
|
|
|
-- See `:help cmp`
|
|
|
|
-- See `:help cmp`
|
|
|
|
local cmp = require("cmp")
|
|
|
|
local cmp = require("cmp")
|
|
|
|
|
|
|
|
local luasnip = require("luasnip")
|
|
|
|
|
|
|
|
luasnip.config.setup({})
|
|
|
|
cmp.setup({
|
|
|
|
cmp.setup({
|
|
|
|
|
|
|
|
snippet = {
|
|
|
|
|
|
|
|
expand = function(args)
|
|
|
|
|
|
|
|
luasnip.lsp_expand(args.body)
|
|
|
|
|
|
|
|
end,
|
|
|
|
|
|
|
|
},
|
|
|
|
completion = { completeopt = "menu,menuone,noinsert" },
|
|
|
|
completion = { completeopt = "menu,menuone,noinsert" },
|
|
|
|
|
|
|
|
|
|
|
|
-- For an understanding of why these mappings were
|
|
|
|
-- For an understanding of why these mappings were
|
|
|
@ -496,6 +518,11 @@ require("lazy").setup({
|
|
|
|
-- completions whenever it has completion options available.
|
|
|
|
-- completions whenever it has completion options available.
|
|
|
|
["<C-Space>"] = cmp.mapping.complete({}),
|
|
|
|
["<C-Space>"] = cmp.mapping.complete({}),
|
|
|
|
}),
|
|
|
|
}),
|
|
|
|
|
|
|
|
sources = {
|
|
|
|
|
|
|
|
{ name = "nvim_lsp" },
|
|
|
|
|
|
|
|
{ name = "luasnip" },
|
|
|
|
|
|
|
|
{ name = "path" },
|
|
|
|
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
end,
|
|
|
|
end,
|
|
|
|
},
|
|
|
|
},
|
|
|
|