diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index 883f51f..1f37f1a 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -13,8 +13,12 @@ require'lspconfig'.rust_analyzer.setup{ on_attach=lsp_status.on_attach, settings = { ["rust-analyzer"] = { + procMacro = { + enable = true + }, cargo = { - allFeatures = true + allFeatures = true, + loadOutDirsFromCheck = true }, updates = { channel = "nightly" @@ -49,6 +53,26 @@ require'lspconfig'.rnix.setup{ capabilities = capabilities } +require'lspconfig'.dartls.setup{ + on_attach = lsp_status.on_attach, + capabilities = capabilities, + cmd = {"dart", vim.fn.expand("$DART_SDK") .. "/snapshots/analysis_server.dart.snapshot", "--lsp"} +} + +require'lspconfig'.vuels.setup{ + on_attach = lsp_status.on_attach, + capabilities = capabilities, + config = { + vetur = { + defaultFormatter = { + js = "prettier", + ts = "prettier", + html = "prettier" + } + } + } +} + --[[ local system_name if vim.fn.has("mac") == 1 then system_name = "macOS" diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index c1add68..44d459d 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -53,4 +53,5 @@ return require('packer').startup(function() use 'andymass/vim-matchup' use 'b3nj5m1n/kommentary' use 'onsails/lspkind-nvim' + use 'editorconfig/editorconfig-vim' end) diff --git a/nvim/lua/tree_sitter.lua b/nvim/lua/tree_sitter.lua index deef35d..f7aa0e1 100644 --- a/nvim/lua/tree_sitter.lua +++ b/nvim/lua/tree_sitter.lua @@ -1,5 +1,8 @@ require'nvim-treesitter.configs'.setup { - ensure_installed = {"rust", "c", "cpp", "json", "lua", "python", "toml", "latex", "nix"}, + ensure_installed = {"rust", "c", "cpp", "json", "lua", "python", "toml", "latex", "nix", "vue", "javascript", "dart"}, + ident = { + enable = true + }, highlight = { enable = true, -- false will disable the whole extension disable = {"elixir", "teal"}, -- list of language that will be disabled