pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

update_capabilities deprecate, terraformls

nix-components
pegasust 2022-11-02 11:30:40 -07:00
parent d8e9004a8e
commit 3afa514e6c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neovim/init.lua
View File

@ -83,6 +83,7 @@ Plug('hrsh7th/cmp-nvim-lsp')
Plug('hrsh7th/cmp-buffer') Plug('hrsh7th/cmp-buffer')
Plug('hrsh7th/nvim-cmp') Plug('hrsh7th/nvim-cmp')
Plug('onsails/lspkind-nvim') Plug('onsails/lspkind-nvim')
Plug('yioneko/nvim-yati') -- hopefully fixes Python indentation auto-correct from Tree-sitter
-- Plug('tzachar/cmp-tabnine', { ['do'] = './install.sh' }) -- Plug('tzachar/cmp-tabnine', { ['do'] = './install.sh' })
-- DevExp -- DevExp
@ -276,6 +277,7 @@ end, { desc = '[Z]ettelkasten [G]rep' })
-- treesitter -- treesitter
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
yati = { enable = true },
ensure_installed = { ensure_installed = {
'tsx', 'toml', 'lua', 'typescript', 'rust', 'go', 'yaml', 'json', 'php', 'css', 'tsx', 'toml', 'lua', 'typescript', 'rust', 'go', 'yaml', 'json', 'php', 'css',
'python', 'prisma', 'html', "dockerfile", "c", "cpp", "hcl", "svelte", "astro", 'python', 'prisma', 'html', "dockerfile", "c", "cpp", "hcl", "svelte", "astro",
@ -283,7 +285,7 @@ require('nvim-treesitter.configs').setup {
}, },
sync_install = false, sync_install = false,
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true, disabled = { "python" } },
incremental_selection = { incremental_selection = {
enable = true, enable = true,
keymaps = { keymaps = {
@ -411,7 +413,7 @@ local on_attach = function(_client, bufnr)
end end
-- nvim-cmp supports additional completion capabilities -- nvim-cmp supports additional completion capabilities
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
-- local tabnine = require('cmp_tabnine.config') -- local tabnine = require('cmp_tabnine.config')
-- tabnine.setup({ -- tabnine.setup({
-- max_lines = 1000, -- max_lines = 1000,
@ -424,7 +426,7 @@ local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protoco
-- }) -- })
-- default language servers -- default language servers
local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'cmake', 'tailwindcss', 'prismals', local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'cmake', 'tailwindcss', 'prismals',
'rnix', 'eslint', 'terraform-ls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls", 'yamlls' } 'rnix', 'eslint', 'terraformls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls", 'yamlls' }
require("mason").setup({ require("mason").setup({
ui = { ui = {
icons = { icons = {
@ -666,7 +668,7 @@ require("rust-tools").setup {
vim.keymap.set('n', keys, func, { noremap = true, buffer = bufnr, desc = desc }) vim.keymap.set('n', keys, func, { noremap = true, buffer = bufnr, desc = desc })
end end
on_attach(client, bufnr); on_attach(client, bufnr);
nmap('K', require'rust-tools'.hover_actions.hover_actions, 'Hover Documentation') nmap('K', require 'rust-tools'.hover_actions.hover_actions, 'Hover Documentation')
end, end,
capabilities = capabilities, capabilities = capabilities,