commit
This commit is contained in:
@ -12,6 +12,11 @@ return {
|
||||
opts = {
|
||||
-- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
|
||||
animation = true,
|
||||
gitsigns = {
|
||||
added = { enabled = true, icon = "+" },
|
||||
changed = { enabled = true, icon = "~" },
|
||||
deleted = { enabled = true, icon = "-" },
|
||||
},
|
||||
insert_at_start = true,
|
||||
auto_hide = true,
|
||||
sidebar_filetypes = {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
local api = vim.api
|
||||
|
||||
return {
|
||||
"stevearc/conform.nvim",
|
||||
--opts = {},
|
||||
@ -8,7 +10,7 @@ return {
|
||||
},
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
api.nvim_create_autocmd("BufWritePre", {
|
||||
pattern = "*",
|
||||
callback = function(args)
|
||||
require("conform").format({ bufnr = args.buf })
|
||||
|
||||
@ -1,50 +1,47 @@
|
||||
return {
|
||||
-- Main LSP Configuration
|
||||
'neovim/nvim-lspconfig',
|
||||
-- Main LSP Configuration
|
||||
"neovim/nvim-lspconfig",
|
||||
|
||||
dependencies = {
|
||||
-- Automatically install LSPs and related tools to stdpath for Neovim
|
||||
{
|
||||
'williamboman/mason.nvim', config = true,
|
||||
}, -- NOTE: Must be loaded before dependants
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
--'WhoIsSethDaniel/mason-tool-installer.nvim',
|
||||
--{ 'j-hui/fidget.nvim', opts = {} },
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
},
|
||||
|
||||
config = function()
|
||||
--local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
--capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
|
||||
dependencies = {
|
||||
-- Automatically install LSPs and related tools to stdpath for Neovim
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
config = true,
|
||||
}, -- NOTE: Must be loaded before dependants
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
--'WhoIsSethDaniel/mason-tool-installer.nvim',
|
||||
--{ 'j-hui/fidget.nvim', opts = {} },
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
},
|
||||
|
||||
local servers = {
|
||||
gopls = {},
|
||||
}
|
||||
config = function()
|
||||
--local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
--capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
|
||||
|
||||
require('mason').setup()
|
||||
local servers = {
|
||||
gopls = {},
|
||||
}
|
||||
|
||||
--local ensure_installed = vim.tbl_keys(servers or {})
|
||||
--vim.list_extend(ensure_installed, {
|
||||
-- 'stylua', -- Used to format Lua code
|
||||
--})
|
||||
require("mason").setup()
|
||||
|
||||
--require('mason-tool-installer').setup { ensure_installed = ensure_installed }
|
||||
--local ensure_installed = vim.tbl_keys(servers or {})
|
||||
--vim.list_extend(ensure_installed, {
|
||||
-- 'stylua', -- Used to format Lua code
|
||||
--})
|
||||
|
||||
require('mason-lspconfig').setup {
|
||||
handlers = {
|
||||
function(server_name)
|
||||
--require('mason-tool-installer').setup { ensure_installed = ensure_installed }
|
||||
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
require("mason-lspconfig").setup({
|
||||
handlers = {
|
||||
function(server_name)
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
|
||||
|
||||
|
||||
local server = servers[server_name] or {}
|
||||
server.capabilities = capabilities
|
||||
-- server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
||||
require('lspconfig')[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
}
|
||||
end,
|
||||
local server = servers[server_name] or {}
|
||||
server.capabilities = capabilities
|
||||
-- server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
||||
require("lspconfig")[server_name].setup(server)
|
||||
end,
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
return {
|
||||
'nvim-lualine/lualine.nvim',
|
||||
dependencies = { 'nvim-tree/nvim-web-devicons' },
|
||||
config = function()
|
||||
require('lualine').setup()
|
||||
end
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
config = function()
|
||||
require("lualine").setup()
|
||||
end,
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
return {
|
||||
"nvim-neo-tree/neo-tree.nvim",
|
||||
branch = "v3.x",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
|
||||
"MunifTanjim/nui.nvim",
|
||||
-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
|
||||
}
|
||||
"nvim-neo-tree/neo-tree.nvim",
|
||||
branch = "v3.x",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
|
||||
"MunifTanjim/nui.nvim",
|
||||
-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
|
||||
},
|
||||
}
|
||||
|
||||
@ -1,71 +1,71 @@
|
||||
return {
|
||||
"hrsh7th/nvim-cmp",
|
||||
event = "InsertEnter",
|
||||
dependencies = {
|
||||
-- {
|
||||
-- snippet plugin
|
||||
-- "L3MON4D3/LuaSnip",
|
||||
-- dependencies = "rafamadriz/friendly-snippets",
|
||||
-- opts = { history = true, updateevents = "TextChanged,TextChangedI" },
|
||||
-- config = function(_, opts)
|
||||
-- require("luasnip").config.set_config(opts)
|
||||
-- require "nvchad.configs.luasnip"
|
||||
-- end,
|
||||
--},
|
||||
"hrsh7th/nvim-cmp",
|
||||
event = "InsertEnter",
|
||||
dependencies = {
|
||||
-- {
|
||||
-- snippet plugin
|
||||
-- "L3MON4D3/LuaSnip",
|
||||
-- dependencies = "rafamadriz/friendly-snippets",
|
||||
-- opts = { history = true, updateevents = "TextChanged,TextChangedI" },
|
||||
-- config = function(_, opts)
|
||||
-- require("luasnip").config.set_config(opts)
|
||||
-- require "nvchad.configs.luasnip"
|
||||
-- end,
|
||||
--},
|
||||
|
||||
-- autopairing of (){}[] etc
|
||||
--{
|
||||
-- "windwp/nvim-autopairs",
|
||||
-- opts = {
|
||||
-- fast_wrap = {},
|
||||
-- disable_filetype = { "TelescopePrompt", "vim" },
|
||||
-- },
|
||||
-- config = function(_, opts)
|
||||
-- require("nvim-autopairs").setup(opts)
|
||||
--
|
||||
-- setup cmp for autopairs
|
||||
-- local cmp_autopairs = require "nvim-autopairs.completion.cmp"
|
||||
-- require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done())
|
||||
-- end,
|
||||
-- },
|
||||
-- autopairing of (){}[] etc
|
||||
--{
|
||||
-- "windwp/nvim-autopairs",
|
||||
-- opts = {
|
||||
-- fast_wrap = {},
|
||||
-- disable_filetype = { "TelescopePrompt", "vim" },
|
||||
-- },
|
||||
-- config = function(_, opts)
|
||||
-- require("nvim-autopairs").setup(opts)
|
||||
--
|
||||
-- setup cmp for autopairs
|
||||
-- local cmp_autopairs = require "nvim-autopairs.completion.cmp"
|
||||
-- require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done())
|
||||
-- end,
|
||||
-- },
|
||||
|
||||
-- cmp sources plugins
|
||||
--{
|
||||
-- "saadparwaiz1/cmp_luasnip",
|
||||
--"hrsh7th/cmp-nvim-lua",
|
||||
-- "hrsh7th/cmp-nvim-lsp",
|
||||
-- "hrsh7th/cmp-buffer",
|
||||
-- "hrsh7th/cmp-path",
|
||||
-- },
|
||||
},
|
||||
config = function()
|
||||
local cmp = require('cmp')
|
||||
-- snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
-- expand = function(args)
|
||||
-- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
|
||||
-- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
|
||||
-- require('snippy').expand_snippet(args.body) -- For `snippy` users.
|
||||
-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
|
||||
-- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+)
|
||||
--end,
|
||||
--},
|
||||
-- cmp sources plugins
|
||||
--{
|
||||
-- "saadparwaiz1/cmp_luasnip",
|
||||
--"hrsh7th/cmp-nvim-lua",
|
||||
-- "hrsh7th/cmp-nvim-lsp",
|
||||
-- "hrsh7th/cmp-buffer",
|
||||
-- "hrsh7th/cmp-path",
|
||||
-- },
|
||||
},
|
||||
config = function()
|
||||
local cmp = require("cmp")
|
||||
-- snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
-- expand = function(args)
|
||||
-- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
|
||||
-- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
|
||||
-- require('snippy').expand_snippet(args.body) -- For `snippy` users.
|
||||
-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
|
||||
-- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+)
|
||||
--end,
|
||||
--},
|
||||
|
||||
cmp.setup({
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
}),
|
||||
})
|
||||
end
|
||||
--opts = function()
|
||||
-- return require "nvchad.configs.cmp"
|
||||
--end,
|
||||
}
|
||||
cmp.setup({
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
}),
|
||||
})
|
||||
end,
|
||||
--opts = function()
|
||||
-- return require "nvchad.configs.cmp"
|
||||
--end,
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
return {
|
||||
"navarasu/onedark.nvim",
|
||||
config = function()
|
||||
require('onedark').load()
|
||||
end,
|
||||
"navarasu/onedark.nvim",
|
||||
config = function()
|
||||
require("onedark").load()
|
||||
end,
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
return {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
||||
-- cmd = "Telescope",
|
||||
opts = function()
|
||||
-- return require "nvchad.configs.telescope"
|
||||
end,
|
||||
}
|
||||
return {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
||||
-- cmd = "Telescope",
|
||||
opts = function()
|
||||
-- return require "nvchad.configs.telescope"
|
||||
end,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user