From 821f9bee275d4a5fe83b906c7371d954095fc9e8 Mon Sep 17 00:00:00 2001 From: mace Date: Fri, 3 Apr 2026 10:35:50 +0200 Subject: [PATCH] fix treesitter config --- init.lua | 31 +++++++++++-------------------- lua/custom/lspconfig.lua | 8 +++++++- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/init.lua b/init.lua index 8609a3c..ee5b642 100644 --- a/init.lua +++ b/init.lua @@ -152,34 +152,25 @@ require('lazy').setup({ }, }, - { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - main = 'nvim-treesitter.configs', -- Sets main module to use for opts - -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - opts = { +{ -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + lazy = false, + build = ':TSUpdate', + config = function() + require('nvim-treesitter.config').setup({ ensure_installed = { 'bash', 'php', 'rust', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, - -- Autoinstall languages that are not installed auto_install = true, highlight = { enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. additional_vim_regex_highlighting = { 'ruby' }, }, indent = { enable = true, disable = { 'ruby' } }, - }, - dependencies = { - 'nvim-treesitter/nvim-treesitter-textobjects', - }, - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + }) + end, + dependencies = { + 'nvim-treesitter/nvim-treesitter-textobjects', }, +}, -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart -- These are some example plugins that I've included in the kickstart repository. diff --git a/lua/custom/lspconfig.lua b/lua/custom/lspconfig.lua index eb495aa..28f7d71 100644 --- a/lua/custom/lspconfig.lua +++ b/lua/custom/lspconfig.lua @@ -156,7 +156,13 @@ setup_server("intelephense", { filetypes = { "php" }, -- root_dir = fallback_root_dir, init_options = { - licenceKey = vim.fn.readfile(vim.fn.expand("$HOME/.config/intelephense/license.txt"))[1], + licenceKey = (function() + local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt") + if vim.fn.filereadable(license_path) == 1 then + return vim.fn.readfile(license_path)[1] + end + return nil + end)(), }, settings = { intelephense = {