Skip to content

Commit 700c030

Browse files
committed
Merge branch 'story/ts_server-updates'
2 parents e376de2 + 6029ee5 commit 700c030

File tree

1 file changed

+40
-3
lines changed

1 file changed

+40
-3
lines changed

init.lua

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
9191
vim.g.maplocalleader = ' '
9292

9393
-- Set to true if you have a Nerd Font installed and selected in the terminal
94-
vim.g.have_nerd_font = false
94+
vim.g.have_nerd_font = true
9595

9696
-- [[ Setting options ]]
9797
-- See `:help vim.o`
@@ -694,13 +694,34 @@ require('lazy').setup({
694694
-- But for many setups, the LSP (`ts_ls`) will work just fine
695695
-- ts_ls = {},
696696
--
697+
volar = {},
697698
jedi_language_server = {},
698699
intelephense = {},
699700
terraformls = {},
700701
templ = {
701702
filetypes = { 'templ' },
702703
},
703-
tsserver = {},
704+
ts_ls = {
705+
settings = {
706+
implicitProjectConfiguration = {
707+
checkJs = true,
708+
},
709+
},
710+
init_options = {
711+
plugins = {
712+
{
713+
name = '@vue/typescript-plugin',
714+
location = '/home/ocxm/.asdf/installs/nodejs/23.2.0/lib/node_modules/@vue/typescript-plugin',
715+
languages = { 'javascript', 'typescript', 'vue' },
716+
},
717+
},
718+
},
719+
filetypes = {
720+
'javascript',
721+
'typescript',
722+
'vue',
723+
},
724+
},
704725
gopls = {
705726
settings = {
706727
gopls = {
@@ -974,7 +995,23 @@ require('lazy').setup({
974995
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
975996
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
976997
opts = {
977-
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
998+
ensure_installed = {
999+
'bash',
1000+
'c',
1001+
'diff',
1002+
'go',
1003+
'html',
1004+
'javascript',
1005+
'lua',
1006+
'luadoc',
1007+
'markdown',
1008+
'markdown_inline',
1009+
'php',
1010+
'query',
1011+
'terraform',
1012+
'vim',
1013+
'vimdoc',
1014+
},
9781015
-- Autoinstall languages that are not installed
9791016
auto_install = true,
9801017
highlight = {

0 commit comments

Comments
 (0)