mathias
/
nvim-kickstart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix treesitter config, configs issue

main
Mathias Rothenhaeusler 2026-04-03 10:55:43 +02:00
parent 04f1abe4d1
commit d1167c2fe9
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.lua
View File

@ -157,7 +157,7 @@ require('lazy').setup({
lazy = false, lazy = false,
build = ':TSUpdate', build = ':TSUpdate',
config = function() config = function()
require('nvim-treesitter.config').setup({ require('nvim-treesitter.configs').setup({
ensure_installed = { 'bash', 'php', 'rust', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, ensure_installed = { 'bash', 'php', 'rust', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
auto_install = true, auto_install = true,
highlight = { highlight = {

8
lua/custom/lspconfig.lua
View File

@ -158,16 +158,8 @@ setup_server("intelephense", {
init_options = { init_options = {
licenceKey = (function() licenceKey = (function()
local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt") local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt")
<<<<<<< HEAD
if vim.fn.filereadable(license_path) == 1 then if vim.fn.filereadable(license_path) == 1 then
return vim.fn.readfile(license_path)[1] return vim.fn.readfile(license_path)[1]
=======
local file = io.open(license_path, "r")
if file then
local content = file:read("*l") -- read first line
file:close()
return content
>>>>>>> fbcc0b8d619e6f84448645f49d0a1dda9de840e5
end end
return nil return nil
end)(), end)(),