init.lua

@@ -154,22 +154,31 @@ require('lazy').setup({
 
     { -- Highlight, edit, and navigate code
         'nvim-treesitter/nvim-treesitter',
-    lazy = false,
         build = ':TSUpdate',
-    config = function()
-        require('nvim-treesitter.config').setup({
+        main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+        -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
+        opts = {
             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' } },
-        })
-    end,
+        },
         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
     },
 
     -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart

lua/custom/lspconfig.lua

@@ -158,16 +158,11 @@ setup_server("intelephense", {
     init_options = {
         licenceKey = (function()
             local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt")
-<<<<<<< HEAD
-            if vim.fn.filereadable(license_path) == 1 then
-                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
             return nil
         end)(),