feat: add lua-format to lsp
This commit is contained in:
parent
a893ddf25c
commit
b5489face8
GPG key ID:
4AA25D647AA54CC7
3 changed files with 98 additions and 113 deletions
|
|
@ -52,6 +52,6 @@ vim.cmd([[
|
|||
vim.g.coq_settings = {
|
||||
auto_start = "shut-up",
|
||||
keymap = {
|
||||
jump_to_mark = "", -- prevent <C-h> remapping
|
||||
},
|
||||
jump_to_mark = "" -- prevent <C-h> remapping
|
||||
}
|
||||
}
|
||||
|
|
|
|||
157
lua/plugins.lua
157
lua/plugins.lua
|
|
@ -1,10 +1,13 @@
|
|||
local fn = vim.fn
|
||||
|
||||
-- boostrap packer
|
||||
local install_path = fn.stdpath('data')..'/site/pack/packer/opt/packer.nvim'
|
||||
local install_path = fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim'
|
||||
local packer_bootstrap
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
packer_bootstrap = fn.system({'git', 'clone','https://github.com/wbthomason/packer.nvim', install_path})
|
||||
packer_bootstrap = fn.system({
|
||||
'git', 'clone', 'https://github.com/wbthomason/packer.nvim',
|
||||
install_path
|
||||
})
|
||||
end
|
||||
|
||||
-- run PackerSync everytime plugins.lua is updated
|
||||
|
|
@ -19,94 +22,91 @@ vim.cmd([[packadd packer.nvim]])
|
|||
|
||||
-- initialize plugins
|
||||
return require('packer').startup(function(use)
|
||||
-- let packer manage itself
|
||||
use({'wbthomason/packer.nvim', opt = true})
|
||||
-- let packer manage itself
|
||||
use({'wbthomason/packer.nvim', opt = true})
|
||||
|
||||
-- theme
|
||||
-- theme
|
||||
use("ishan9299/nvim-solarized-lua")
|
||||
|
||||
-- commenting
|
||||
use("tpope/vim-commentary")
|
||||
|
||||
-- session handling
|
||||
use('tpope/vim-obsession')
|
||||
use('dhruvasagar/vim-prosession')
|
||||
-- session handling
|
||||
use('tpope/vim-obsession')
|
||||
use('dhruvasagar/vim-prosession')
|
||||
|
||||
-- status line
|
||||
use {
|
||||
'nvim-lualine/lualine.nvim',
|
||||
requires = { 'kyazdani42/nvim-web-devicons', opt = true },
|
||||
config = function()
|
||||
require('lualine').setup()
|
||||
end
|
||||
}
|
||||
-- status line
|
||||
use {
|
||||
'nvim-lualine/lualine.nvim',
|
||||
requires = {'kyazdani42/nvim-web-devicons', opt = true},
|
||||
config = function() require('lualine').setup() end
|
||||
}
|
||||
|
||||
-- tabline
|
||||
use {
|
||||
'kdheepak/tabline.nvim',
|
||||
config = function()
|
||||
require'tabline'.setup {
|
||||
enable = true,
|
||||
options = {
|
||||
show_filename_only = true,
|
||||
}
|
||||
}
|
||||
end,
|
||||
requires = { { 'hoob3rt/lualine.nvim' }, {'kyazdani42/nvim-web-devicons', opt = true} }
|
||||
}
|
||||
-- tabline
|
||||
use {
|
||||
'kdheepak/tabline.nvim',
|
||||
config = function()
|
||||
require'tabline'.setup {
|
||||
enable = true,
|
||||
options = {show_filename_only = true}
|
||||
}
|
||||
end,
|
||||
requires = {
|
||||
{'hoob3rt/lualine.nvim'},
|
||||
{'kyazdani42/nvim-web-devicons', opt = true}
|
||||
}
|
||||
}
|
||||
|
||||
-- blankline
|
||||
use({
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
config = function ()
|
||||
require("indent_blankline").setup {
|
||||
char = "┊",
|
||||
buftype_exclude = {"terminal", "help"}
|
||||
}
|
||||
end
|
||||
})
|
||||
-- blankline
|
||||
use({
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
config = function()
|
||||
require("indent_blankline").setup {
|
||||
char = "┊",
|
||||
buftype_exclude = {"terminal", "help"}
|
||||
}
|
||||
end
|
||||
})
|
||||
|
||||
-- git
|
||||
use('tpope/vim-fugitive')
|
||||
use ({
|
||||
'lewis6991/gitsigns.nvim',
|
||||
requires = {'nvim-lua/plenary.nvim'},
|
||||
config = function() require('gitsigns').setup() end
|
||||
})
|
||||
-- git
|
||||
use('tpope/vim-fugitive')
|
||||
use({
|
||||
'lewis6991/gitsigns.nvim',
|
||||
requires = {'nvim-lua/plenary.nvim'},
|
||||
config = function() require('gitsigns').setup() end
|
||||
})
|
||||
|
||||
-- autocompletion
|
||||
use({
|
||||
"ms-jpq/coq_nvim",
|
||||
branch="coq",
|
||||
requires = {
|
||||
{'ms-jpq/coq.artifacts', branch = 'artifacts'},
|
||||
},
|
||||
})
|
||||
-- autocompletion
|
||||
use({
|
||||
"ms-jpq/coq_nvim",
|
||||
branch = "coq",
|
||||
requires = {{'ms-jpq/coq.artifacts', branch = 'artifacts'}}
|
||||
})
|
||||
|
||||
-- highlight current symbol
|
||||
use({"RRethy/vim-illuminate"})
|
||||
|
||||
-- language server
|
||||
use({
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function() require("plugins.lspconfig") end,
|
||||
})
|
||||
-- language server
|
||||
use({
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function() require("plugins.lspconfig") end
|
||||
})
|
||||
|
||||
use('williamboman/nvim-lsp-installer')
|
||||
|
||||
-- treesitter
|
||||
use({
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
config = function() require('plugins.treesitter') end,
|
||||
run = ':TSUpdate'
|
||||
})
|
||||
-- treesitter
|
||||
use({
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
config = function() require('plugins.treesitter') end,
|
||||
run = ':TSUpdate'
|
||||
})
|
||||
|
||||
-- Telescope
|
||||
use({
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = {{'nvim-lua/plenary.nvim'}},
|
||||
config = function() require('plugins.telescope') end,
|
||||
})
|
||||
-- Telescope
|
||||
use({
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = {{'nvim-lua/plenary.nvim'}},
|
||||
config = function() require('plugins.telescope') end
|
||||
})
|
||||
|
||||
-- automatic pairs
|
||||
use({"Raimondi/delimitMate"})
|
||||
|
|
@ -118,22 +118,15 @@ return require('packer').startup(function(use)
|
|||
use({
|
||||
"akinsho/nvim-toggleterm.lua",
|
||||
config = function()
|
||||
require("toggleterm").setup({
|
||||
size = 32,
|
||||
open_mapping = [[<F4>]],
|
||||
})
|
||||
end,
|
||||
require("toggleterm").setup({size = 32, open_mapping = [[<F4>]]})
|
||||
end
|
||||
})
|
||||
|
||||
-- buffer closing
|
||||
use({
|
||||
"sar/bbye.nvim"
|
||||
})
|
||||
use({"sar/bbye.nvim"})
|
||||
|
||||
-- ansible filetype
|
||||
use({"pearofducks/ansible-vim"})
|
||||
|
||||
if packer_bootstrap then
|
||||
require('packer').sync()
|
||||
end
|
||||
if packer_bootstrap then require('packer').sync() end
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -6,18 +6,8 @@ table.insert(nvim_runtime_path, "lua/?.lua")
|
|||
table.insert(nvim_runtime_path, "lua/?/init.lua")
|
||||
|
||||
local language_servers = {
|
||||
"ansiblels",
|
||||
"bashls",
|
||||
"dockerls",
|
||||
"eslint",
|
||||
"html",
|
||||
"pyright",
|
||||
"rust_analyzer",
|
||||
"sumneko_lua",
|
||||
"svelte",
|
||||
"taplo",
|
||||
"tsserver",
|
||||
"volar",
|
||||
"ansiblels", "bashls", "dockerls", "efm", "eslint", "html", "pyright",
|
||||
"rust_analyzer", "sumneko_lua", "svelte", "taplo", "tsserver", "volar"
|
||||
}
|
||||
|
||||
for _, server_name in pairs(language_servers) do
|
||||
|
|
@ -30,30 +20,31 @@ for _, server_name in pairs(language_servers) do
|
|||
end
|
||||
|
||||
local extra_server_opts = {
|
||||
["efm"] = function(opts)
|
||||
opts.filetypes = {"lua"}
|
||||
opts.init_options = {documentFormatting = true}
|
||||
opts.settings = {
|
||||
rootMarkers = {".git/"},
|
||||
languages = {
|
||||
lua = {{formatCommand = "lua-format -i", formatStdin = true}}
|
||||
}
|
||||
}
|
||||
end,
|
||||
["sumneko_lua"] = function(opts)
|
||||
opts.settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = 'LuaJIT',
|
||||
path = nvim_runtime_path,
|
||||
},
|
||||
diagnostics = {
|
||||
globals = {'vim'},
|
||||
},
|
||||
workspace = {
|
||||
library = vim.api.nvim_get_runtime_file("", true),
|
||||
},
|
||||
telemetry ={
|
||||
enable = false,
|
||||
},
|
||||
},
|
||||
runtime = {version = 'LuaJIT', path = nvim_runtime_path},
|
||||
diagnostics = {globals = {'vim'}},
|
||||
workspace = {library = vim.api.nvim_get_runtime_file("", true)},
|
||||
telemetry = {enable = false}
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
|
||||
local function custom_on_attach(client, buffer_nr)
|
||||
-- onmifunc
|
||||
vim.api.nvim_buf_set_option(0, "omnifunc", "v:lua.vim.lsp.omnifunc")
|
||||
vim.api.nvim_buf_set_option(buffer_nr, "omnifunc", "v:lua.vim.lsp.omnifunc")
|
||||
|
||||
-- Helper function
|
||||
local opts = {noremap = true, silent = true}
|
||||
|
|
@ -80,7 +71,8 @@ local function custom_on_attach(client, buffer_nr)
|
|||
bufnnoremap("<C-p>", "<Cmd>lua vim.diagnostic.goto_prev()<CR>")
|
||||
|
||||
-- Show line diagnostics
|
||||
bufnnoremap("<leader>d", '<Cmd>lua vim.diagnostic.open_float(0, {scope = "line"})<CR>')
|
||||
bufnnoremap("<leader>d",
|
||||
'<Cmd>lua vim.diagnostic.open_float(0, {scope = "line"})<CR>')
|
||||
|
||||
-- Open local diagnostics in local list
|
||||
bufnnoremap("<leader>D", "<Cmd>lua vim.diagnostic.setloclist()<CR>")
|
||||
|
|
@ -99,7 +91,7 @@ end
|
|||
lsp_installer.on_server_ready(function(server)
|
||||
local opts = coq.lsp_ensure_capabilities({
|
||||
on_attach = custom_on_attach,
|
||||
capabilities = vim.lsp.protocol.make_client_capabilities(),
|
||||
capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
})
|
||||
|
||||
if extra_server_opts[server.name] then
|
||||
|
|
|
|||
Loading…
Reference in a new issue