mirror of
https://github.com/CompeyDev/my-nvim-setup.git
synced 2024-12-13 21:40:37 +00:00
lazy load lspconfig :D
This commit is contained in:
siduck76
parent
2f238742d2
commit
0e9b3832ae
3 changed files with 132 additions and 125 deletions
3
init.lua
3
init.lua
|
|
@ -5,9 +5,6 @@ require "misc-utils"
|
|||
require "top-bufferline"
|
||||
require "statusline"
|
||||
|
||||
-- lsp stuff
|
||||
require "nvim-lspconfig"
|
||||
|
||||
local cmd = vim.cmd
|
||||
local g = vim.g
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
function on_attach(client, bufnr)
|
||||
local M = {}
|
||||
|
||||
M.config = function()
|
||||
function on_attach(client, bufnr)
|
||||
local function buf_set_keymap(...)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, ...)
|
||||
end
|
||||
|
|
@ -33,11 +36,11 @@ function on_attach(client, bufnr)
|
|||
elseif client.resolved_capabilities.document_range_formatting then
|
||||
buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- lspInstall + lspconfig stuff
|
||||
-- lspInstall + lspconfig stuff
|
||||
|
||||
local function setup_servers()
|
||||
local function setup_servers()
|
||||
require "lspinstall".setup()
|
||||
|
||||
local lspconf = require("lspconfig")
|
||||
|
|
@ -51,9 +54,7 @@ local function setup_servers()
|
|||
}
|
||||
elseif lang == "lua" then
|
||||
lspconf[lang].setup {
|
||||
root_dir = function()
|
||||
return vim.loop.cwd()
|
||||
end,
|
||||
root_dir = vim.loop.cwd,
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
|
|
@ -73,18 +74,21 @@ local function setup_servers()
|
|||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
setup_servers()
|
||||
setup_servers()
|
||||
|
||||
-- Automatically reload after `:LspInstall <server>` so we don't have to restart neovim
|
||||
require "lspinstall".post_install_hook = function()
|
||||
-- Automatically reload after `:LspInstall <server>` so we don't have to restart neovim
|
||||
require "lspinstall".post_install_hook = function()
|
||||
setup_servers() -- reload installed servers
|
||||
vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server
|
||||
vim.cmd("bufdo e") -- triggers FileType autocmd that starts the server
|
||||
end
|
||||
|
||||
-- replace the default lsp diagnostic letters with prettier symbols
|
||||
vim.fn.sign_define("LspDiagnosticsSignError", {text = "", numhl = "LspDiagnosticsDefaultError"})
|
||||
vim.fn.sign_define("LspDiagnosticsSignWarning", {text = "", numhl = "LspDiagnosticsDefaultWarning"})
|
||||
vim.fn.sign_define("LspDiagnosticsSignInformation", {text = "", numhl = "LspDiagnosticsDefaultInformation"})
|
||||
vim.fn.sign_define("LspDiagnosticsSignHint", {text = "", numhl = "LspDiagnosticsDefaultHint"})
|
||||
end
|
||||
|
||||
-- replace the default lsp diagnostic letters with prettier symbols
|
||||
vim.fn.sign_define("LspDiagnosticsSignError", {text = "", numhl = "LspDiagnosticsDefaultError"})
|
||||
vim.fn.sign_define("LspDiagnosticsSignWarning", {text = "", numhl = "LspDiagnosticsDefaultWarning"})
|
||||
vim.fn.sign_define("LspDiagnosticsSignInformation", {text = "", numhl = "LspDiagnosticsDefaultInformation"})
|
||||
vim.fn.sign_define("LspDiagnosticsSignHint", {text = "", numhl = "LspDiagnosticsDefaultHint"})
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@ return packer.startup(
|
|||
function()
|
||||
use "wbthomason/packer.nvim"
|
||||
|
||||
use "akinsho/nvim-bufferline.lua"
|
||||
use "glepnir/galaxyline.nvim"
|
||||
|
||||
-- color related stuff
|
||||
use "siduck76/nvim-base16.lua"
|
||||
|
||||
use {
|
||||
"norcalli/nvim-colorizer.lua",
|
||||
event = "BufRead",
|
||||
|
|
@ -16,7 +18,7 @@ return packer.startup(
|
|||
end
|
||||
}
|
||||
|
||||
-- lang stuff
|
||||
-- language related plugins
|
||||
use {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
event = "BufRead",
|
||||
|
|
@ -25,7 +27,23 @@ return packer.startup(
|
|||
end
|
||||
}
|
||||
|
||||
use "neovim/nvim-lspconfig"
|
||||
use {
|
||||
"neovim/nvim-lspconfig",
|
||||
event = "BufRead",
|
||||
config = function()
|
||||
require("nvim-lspconfig").config()
|
||||
end
|
||||
}
|
||||
|
||||
use "kabouzeid/nvim-lspinstall"
|
||||
|
||||
use {
|
||||
"onsails/lspkind-nvim",
|
||||
event = "BufRead",
|
||||
config = function()
|
||||
require("lspkind").init()
|
||||
end
|
||||
}
|
||||
|
||||
-- load compe in insert mode only
|
||||
use {
|
||||
|
|
@ -36,53 +54,12 @@ return packer.startup(
|
|||
end
|
||||
}
|
||||
|
||||
use {
|
||||
"onsails/lspkind-nvim",
|
||||
event = "BufRead",
|
||||
config = function()
|
||||
require("lspkind").init()
|
||||
end
|
||||
}
|
||||
|
||||
use {
|
||||
"sbdchd/neoformat",
|
||||
cmd = "Neoformat"
|
||||
}
|
||||
|
||||
use "nvim-lua/plenary.nvim"
|
||||
use "kabouzeid/nvim-lspinstall"
|
||||
|
||||
use {
|
||||
"lewis6991/gitsigns.nvim",
|
||||
event = "BufRead",
|
||||
config = function()
|
||||
require("gitsigns-nvim").config()
|
||||
end
|
||||
}
|
||||
|
||||
use "akinsho/nvim-bufferline.lua"
|
||||
use "glepnir/galaxyline.nvim"
|
||||
|
||||
use {
|
||||
"windwp/nvim-autopairs",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("nvim-autopairs").setup()
|
||||
end
|
||||
}
|
||||
|
||||
use {
|
||||
"andymass/vim-matchup",
|
||||
event = "CursorMoved"
|
||||
}
|
||||
|
||||
use {
|
||||
"terrortylor/nvim-comment",
|
||||
cmd = "CommentToggle",
|
||||
config = function()
|
||||
require("nvim_comment").setup()
|
||||
end
|
||||
}
|
||||
|
||||
-- snippet support
|
||||
use {
|
||||
|
|
@ -105,7 +82,36 @@ return packer.startup(
|
|||
use "nvim-telescope/telescope-media-files.nvim"
|
||||
use "nvim-lua/popup.nvim"
|
||||
|
||||
-- misc
|
||||
-- misc plugins
|
||||
use {
|
||||
"lewis6991/gitsigns.nvim",
|
||||
event = "BufRead",
|
||||
config = function()
|
||||
require("gitsigns-nvim").config()
|
||||
end
|
||||
}
|
||||
|
||||
use {
|
||||
"windwp/nvim-autopairs",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("nvim-autopairs").setup()
|
||||
end
|
||||
}
|
||||
|
||||
use {
|
||||
"andymass/vim-matchup",
|
||||
event = "CursorMoved"
|
||||
}
|
||||
|
||||
use {
|
||||
"terrortylor/nvim-comment",
|
||||
cmd = "CommentToggle",
|
||||
config = function()
|
||||
require("nvim_comment").setup()
|
||||
end
|
||||
}
|
||||
|
||||
use {
|
||||
"glepnir/dashboard-nvim",
|
||||
cmd = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue