michael/nvim-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mason intermediate commit. Going to get rid of package management all

Browse Source 
together B)
This commit is contained in:
Michael Peters 2022-09-22 11:31:50 -07:00
parent ec1a872d84
commit c3d4292dd2
8 changed files with 158 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lua/configs/lsp-installer.lua → archive/lua/configs/lsp-installer.lua
View File

@ -1,5 +1,14 @@
local M = {}
-- From plugins.lua
-- LSP EZ Installer
-- use {
-- 'williamboman/nvim-lsp-installer',
-- after = { 'cmp-nvim-lsp', 'nvim-lspconfig' },
-- event = 'BufRead',
-- config = function() require'configs.lsp-installer'.config() end
-- }
function M.config()
local status_lsp_installer_ok, lsp_installer = pcall(require, "nvim-lsp-installer")
if not status_lsp_installer_ok then

48
lua/configs/lsp.lua
View File

@ -1,48 +0,0 @@
local M = {}
function M.config()
local signs = {
{ name = "DiagnosticSignError", text = "" },
{ name = "DiagnosticSignWarn", text = "" },
{ name = "DiagnosticSignHint", text = "" },
{ name = "DiagnosticSignInfo", text = "" },
}
for _, sign in ipairs(signs) do
vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
end
local config = {
virtual_text = false,
signs = {
active = signs,
},
update_in_insert = true,
underline = true,
severity_sort = true,
float = {
focusable = false,
style = "minimal",
border = "rounded",
source = "always",
header = "",
prefix = "",
},
}
vim.diagnostic.config(config)
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
border = "rounded",
})
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
border = "rounded",
})
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
virtual_text = false,
})
end
return M

104
lua/configs/lspconfig.lua Normal file
View File

@ -0,0 +1,104 @@
local M = {}
function M.config()
local signs = {
{ name = "DiagnosticSignError", text = "" },
{ name = "DiagnosticSignWarn", text = "" },
{ name = "DiagnosticSignHint", text = "" },
{ name = "DiagnosticSignInfo", text = "" },
}
for _, sign in ipairs(signs) do
vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
end
local config = {
virtual_text = false,
signs = {
active = signs,
},
update_in_insert = true,
underline = true,
severity_sort = true,
float = {
focusable = false,
style = "minimal",
border = "rounded",
source = "always",
header = "",
prefix = "",
},
}
vim.diagnostic.config(config)
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
border = "rounded",
})
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
border = "rounded",
})
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
virtual_text = false,
})
local status_ok, lspconfig = pcall(require, "lspconfig")
if not status_ok then
return
end
-- Highlight under current selection
local function lsp_highlight_document(client)
if client.resolved_capabilities.document_highlight then
vim.api.nvim_exec(
[[
augroup lsp_document_highlight
autocmd! * <buffer>
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
augroup END
]],
false
)
end
end
local function lsp_keymaps(bufnr)
local opts = { noremap = true, silent = true }
vim.api.nvim_buf_set_keymap(bufnr, "n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gl", "<cmd>lua vim.diagnostic.open_float({ source = false, prefix = function(d, i, ttl) return string.rep(' ', #tostring(ttl) - #tostring(i)) .. tostring(i) .. ': ', nil end })<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "go", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "[d", '<cmd>lua vim.diagnostic.goto_prev({ border = "rounded" })<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "]d", '<cmd>lua vim.diagnostic.goto_next({ border = "rounded" })<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>ll", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>lf", "<cmd>lua vim.lsp.buf.formatting_sync()<CR>", opts)
--vim.cmd [[ command! Format execute 'lua vim.lsp.buf.formatting()' ]]
end
local on_attach = function(client, bufnr)
lsp_keymaps(bufnr)
lsp_highlight_document(client)
end
lspconfig.sumneko_lua.setup {
on_attach = on_attach,
settings = {
Lua = {
format = {
enable = false
},
diagnostics = {
globals = { 'vim' },
},
}
}
}
end
return M

16
lua/configs/mason-lspconfig.lua Normal file
View File

@ -0,0 +1,16 @@
local M = {}
function M.config()
local status_ok, mason_lspconfig = pcall(require, "mason-lspconfig")
if not status_ok then
return
end
mason_lspconfig.setup({
ensure_installed = {
},
automatic_installation = false,
})
end
return M

13
lua/configs/mason.lua Normal file
View File

@ -0,0 +1,13 @@
local M = {}
function M.config()
local status_ok, mason = pcall(require, "mason")
if not status_ok then
return
end
mason.setup {}
end
return M

3
lua/configs/null-ls.lua
View File

@ -19,10 +19,11 @@ function M.config()
sources = {
-- Set a formatter
formatting.prettierd,
--formatting.black,
--TODO: formatting.black,
-- Set a linter
diagnostics.eslint_d,
--TODO: pylint
},
-- Format before save
on_attach = function(client)

3
lua/configs/nvim-tree.lua
View File

@ -16,8 +16,7 @@ function M.config()
},
},
view = {
width = 30,
height = 30,
width = 40,
side = "left",
hide_root_folder = true,
number = false,

23
lua/plugins.lua
View File

@ -89,25 +89,28 @@ packer.startup {
-- LSP
--
-- -- Cursorhold fix
-- Cursorhold fix
use {
"antoinemadec/FixCursorHold.nvim",
config = function() vim.g.cursorhold_updatetime = 300 end,
}
-- LSP EZ Installer
-- :LspInstall
use {
'williamboman/mason.nvim',
config = function() require'configs.mason'.config() end
}
use {
'williamboman/mason-lspconfig',
config = function() require'configs.mason-lspconfig'.config() end
}
-- Built-In LSP Config
use {
'neovim/nvim-lspconfig',
event = 'BufRead',
config = function() require'configs.lsp'.config() end
}
-- LSP EZ Installer
use {
'williamboman/nvim-lsp-installer',
after = { 'cmp-nvim-lsp', 'nvim-lspconfig' },
event = 'BufRead',
config = function() require'configs.lsp-installer'.config() end
config = function() require'configs.lspconfig'.config() end
}
-- Formatting + Linting