Archived
0
0
Fork 0

neovim updates

This commit is contained in:
Daryl Ronningen 2022-07-07 16:14:10 -07:00
parent 9ecfc732f6
commit 992d0fef71
Signed by: Daryl Ronningen
GPG key ID: FD23F0C934A5EC6B
8 changed files with 36 additions and 16 deletions

View file

@ -1,6 +1,7 @@
require("user.options") require("user.options")
require("user.keymaps") require("user.keymaps")
require("user.plugins") require("user.plugins")
require("user.notify")
require("user.cmp") require("user.cmp")
require("user.lsp") require("user.lsp")
require("user.colorscheme") require("user.colorscheme")
@ -23,4 +24,3 @@ require("user.colorizer")
require("user.discord") require("user.discord")
require("user.spectre") require("user.spectre")
require("user.dap") require("user.dap")
require("user.notify")

View file

@ -20,7 +20,6 @@ lspconfig.jsonls.setup({
}) })
require("user.lsp.handlers").setup() require("user.lsp.handlers").setup()
require("user.lsp.installer") require("user.lsp.mason")
require("user.lsp.nullls") require("user.lsp.nullls")
require("user.lsp.nlsp")
require("user.lsp.signature") require("user.lsp.signature")

View file

@ -0,0 +1,18 @@
local status_ok, mason = pcall(require, "mason")
if not status_ok then
return
end
local lspconfig = require("lspconfig")
mason.setup()
require("mason-lspconfig").setup({
automatic_installation = true,
})
lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_config, {
on_attach = require("user.lsp.handlers").on_attach,
capabilities = require("user.lsp.handlers").capabilities,
})
require("user.lsp.settings.sumneko_lua")

View file

@ -0,0 +1,9 @@
local lspconfig = require("lspconfig")
lspconfig.sumneko_lua.setup({
Lua = {
diagnostics = {
globals = { 'vim' },
},
},
})

View file

@ -25,7 +25,7 @@ nvim_tree.setup({
ignore_ft_on_setup = { ignore_ft_on_setup = {
"alpha", "alpha",
}, },
open_on_tab = false, open_on_tab = true,
hijack_cursor = true, hijack_cursor = true,
update_cwd = true, update_cwd = true,
diagnostics = { diagnostics = {

View file

@ -63,8 +63,7 @@ return packer.startup(function(use)
-- LSP -- LSP
use("neovim/nvim-lspconfig") use("neovim/nvim-lspconfig")
use("williamboman/nvim-lsp-installer") use("williamboman/mason.nvim")
use("tamago324/nlsp-settings.nvim")
use("jose-elias-alvarez/null-ls.nvim") use("jose-elias-alvarez/null-ls.nvim")
use("b0o/SchemaStore.nvim") use("b0o/SchemaStore.nvim")
use("ray-x/lsp_signature.nvim") use("ray-x/lsp_signature.nvim")

View file

@ -4,6 +4,6 @@ if not status_ok then
end end
spectre.setup({ spectre.setup({
live_update = false, live_update = true,
is_insert_mode = false, is_insert_mode = true,
}) })

View file

@ -164,10 +164,10 @@ _G.packer_plugins = {
path = "/home/relms/.local/share/nvim/site/pack/packer/start/lualine.nvim", path = "/home/relms/.local/share/nvim/site/pack/packer/start/lualine.nvim",
url = "https://github.com/nvim-lualine/lualine.nvim" url = "https://github.com/nvim-lualine/lualine.nvim"
}, },
["nlsp-settings.nvim"] = { ["mason.nvim"] = {
loaded = true, loaded = true,
path = "/home/relms/.local/share/nvim/site/pack/packer/start/nlsp-settings.nvim", path = "/home/relms/.local/share/nvim/site/pack/packer/start/mason.nvim",
url = "https://github.com/tamago324/nlsp-settings.nvim" url = "https://github.com/williamboman/mason.nvim"
}, },
["nord.nvim"] = { ["nord.nvim"] = {
loaded = true, loaded = true,
@ -209,11 +209,6 @@ _G.packer_plugins = {
path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-dap-virtual-text", path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-dap-virtual-text",
url = "https://github.com/theHamsta/nvim-dap-virtual-text" url = "https://github.com/theHamsta/nvim-dap-virtual-text"
}, },
["nvim-lsp-installer"] = {
loaded = true,
path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
url = "https://github.com/williamboman/nvim-lsp-installer"
},
["nvim-lspconfig"] = { ["nvim-lspconfig"] = {
loaded = true, loaded = true,
path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",