Update neovim dotfiles
This commit is contained in:
@@ -12,6 +12,7 @@ local normal_mode_maps = {
|
||||
{ key = '<leader>n', map = [[<cmd>bnext<cr>]] },
|
||||
{ key = '<leader>p', map = [[<cmd>bprev<cr>]] },
|
||||
{ key = '<leader>q', map = [[<cmd>bw<cr>]] },
|
||||
{ key = '<leader>v', map = [[<cmd>CHADopen<cr>]] },
|
||||
|
||||
-- fzf
|
||||
{ key = '<leader>;', map = [[<cmd>Buffers<cr>]] },
|
||||
|
||||
9
config/nvim/lua/lsp/deno.lua
Normal file
9
config/nvim/lua/lsp/deno.lua
Normal file
@@ -0,0 +1,9 @@
|
||||
local lspconfig = require'lspconfig'
|
||||
local lspstatus = require'lsp-status'
|
||||
local coq = require'coq'
|
||||
|
||||
lspconfig.denols.setup{
|
||||
on_attach=function(client) lspstatus.on_attach(client) return end,
|
||||
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
|
||||
}
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
|
||||
require("lsp.rust-analyzer")
|
||||
require("lsp.lua-language-server")
|
||||
-- require("lsp.pyls")
|
||||
require("lsp.deno")
|
||||
|
||||
-- Set completeopt to have a better completion experience
|
||||
-- vim.o.completeopt= "menuone,noinsert,noselect"
|
||||
vim.o.completeopt= "menuone,noselect"
|
||||
|
||||
-- vim.api.nvim_command [[autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()]]
|
||||
|
||||
@@ -1,18 +1,23 @@
|
||||
local lspconfig = require'lspconfig'
|
||||
-- local lspstatus = require('lsp-status')
|
||||
local lspstatus = require('lsp-status')
|
||||
local coq = require'coq'
|
||||
|
||||
require'lspconfig'.sumneko_lua.setup{
|
||||
lspconfig.sumneko_lua.setup{
|
||||
cmd = { "lua-language-server" },
|
||||
on_attach=function(client) require'completion'.on_attach(client) require'lsp-status'.on_attach(client) return end,
|
||||
-- on_attach=require'completion'.on_attach,
|
||||
on_attach=function(client) lspstatus.on_attach(client) return end,
|
||||
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
|
||||
filetypes = { "lua" },
|
||||
log_level = 2,
|
||||
root_dir = lspconfig.util.root_pattern(".git"),
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = {'vim'},
|
||||
},
|
||||
telemetry = {
|
||||
enable = false
|
||||
enable = false,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-- lspconfig.sumenko_lua.setup(coq.lsp_ensure_capabilities())
|
||||
-- require'lspconfig'.sumneko_lua.setup{coq.lsp_ensure_capabilities()}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
local lspconfig = require'lspconfig'
|
||||
|
||||
lspconfig.pyls.setup{
|
||||
cmd = { "pyls" },
|
||||
filetypes = { "python" },
|
||||
coq.lsp_ensure_capabilities{
|
||||
cmd = { "pyls" },
|
||||
filetypes = { "python" },
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
local lspconfig = require'lspconfig'
|
||||
|
||||
local lspstatus = require'lsp-status'
|
||||
local coq = require'coq'
|
||||
|
||||
lspconfig.rust_analyzer.setup{
|
||||
on_attach=function(client) require'lsp-status'.on_attach(client) return end,
|
||||
capabilities = require'lsp-status'.capabilities,
|
||||
on_attach=function(client) lspstatus.on_attach(client) return end,
|
||||
capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
|
||||
cmd = { "rust-analyzer" },
|
||||
filetypes = { "rust" },
|
||||
root_dir = lspconfig.util.root_pattern("Cargo.toml"),
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
assist = {
|
||||
lruCapacity = 64,
|
||||
assist = {
|
||||
importGranularity = "module",
|
||||
importPrefix = "by_self",
|
||||
},
|
||||
@@ -25,9 +27,6 @@ lspconfig.rust_analyzer.setup{
|
||||
allFeatures = true,
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
lspconfig.rust_analyzer.setup{
|
||||
capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||
}
|
||||
|
||||
@@ -54,15 +54,11 @@ return require('packer').startup(function()
|
||||
use { 'folke/lsp-trouble.nvim', config = function() require("trouble").setup() end, }
|
||||
|
||||
use { 'neovim/nvim-lspconfig', config = function() require("lsp") end, }
|
||||
use { 'williamboman/nvim-lsp-installer' }
|
||||
use { 'nvim-lua/lsp-status.nvim' }
|
||||
|
||||
use { 'ms-jpq/coq_nvim', requires = { 'ms-jpq/coq.artifacts' } }
|
||||
|
||||
|
||||
use {
|
||||
'hrsh7th/nvim-cmp',
|
||||
requires = { 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-buffer', 'saadparwaiz1/cmp_luasnip', 'L3MON4D3/LuaSnip' },
|
||||
config = function() require'nvim-cmp' end,
|
||||
}
|
||||
|
||||
use { 'folke/lsp-colors.nvim' }
|
||||
use { 'nvim-lua/lsp_extensions.nvim' }
|
||||
-- config = function() vim.cmd([[autocmd BufEnter,BufWinEnter,TabEnter *.rs :lua require'lsp_extensions'.inlay_hints()]]) end,
|
||||
@@ -75,13 +71,16 @@ return require('packer').startup(function()
|
||||
config = function() require'setup.toggleterm' end,
|
||||
}
|
||||
|
||||
use { 'airblade/vim-rooter' }
|
||||
-- use { 'airblade/vim-rooter' }
|
||||
use { 'glepnir/dashboard-nvim' }
|
||||
|
||||
-- Treesitter {{{
|
||||
-- use { 'nvim-treesitter/nvim-treesitter' }
|
||||
-- use { 'nvim-treesitter/completion-treesitter' }
|
||||
--- }}}
|
||||
-- Treesitter {{{
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
run = ':TSUpdate'
|
||||
}
|
||||
|
||||
-- }}}
|
||||
|
||||
--: rust {{{
|
||||
use {
|
||||
@@ -91,4 +90,7 @@ return require('packer').startup(function()
|
||||
}
|
||||
-- }}}
|
||||
use { 'vim-python/python-syntax' }
|
||||
|
||||
use { 'ms-jpq/chadtree' }
|
||||
|
||||
end)
|
||||
|
||||
@@ -17,7 +17,6 @@ require("toggleterm").setup{
|
||||
-- see :h nvim_win_open for details on borders however
|
||||
-- the 'curved' border is a custom border type
|
||||
-- not natively supported but implemented in this plugin.
|
||||
|
||||
-- border = 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
|
||||
border = 'single',
|
||||
width = 30,
|
||||
|
||||
@@ -121,12 +121,12 @@ gls.left[2] = {
|
||||
}
|
||||
}
|
||||
|
||||
gls.left[3] = {
|
||||
ShowLspStatus = {
|
||||
provider = lsp_status.status,
|
||||
highlight = { colors.grey , colors.dark_black, 'bold' }
|
||||
}
|
||||
}
|
||||
-- gls.left[3] = {
|
||||
-- ShowLspStatus = {
|
||||
-- provider = lsp_status.status,
|
||||
-- highlight = { colors.grey , colors.dark_black, 'bold' }
|
||||
-- }
|
||||
-- }
|
||||
|
||||
|
||||
-- Right Side
|
||||
|
||||
Reference in New Issue
Block a user