nnovak/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Update nvim-treesitter to latest

Browse Source
This commit is contained in:
Nicholas Novak
2026-05-03 15:37:26 -07:00
parent adb2d8f7ca
commit ba583727d2
2 changed files with 836 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/.config/nvim/init.lua
+120 -350
View File
@@ -1,22 +1,22 @@
-- Set <space> as the leader key
-- See `:help mapleader`
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
vim.g.mapleader = " "
vim.g.maplocalleader = " "
-- Install package manager
-- https://github.com/folke/lazy.nvim
-- `:help lazy.nvim.txt` for more info
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then
vim.fn.system {
'git',
'clone',
'--filter=blob:none',
'https://github.com/folke/lazy.nvim.git',
'--branch=stable', -- latest stable release
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
}
})
end
vim.opt.rtp:prepend(lazypath)
@@ -25,14 +25,14 @@ vim.opt.rtp:prepend(lazypath)
--
-- You can also configure plugins after the setup call,
-- as they will be available in your neovim runtime.
require('lazy').setup({
require("lazy").setup({
-- NOTE: First, some plugins that don't require any configuration
-- Git related plugins
'tpope/vim-fugitive',
'tpope/vim-rhubarb',
"tpope/vim-fugitive",
"tpope/vim-rhubarb",
'preservim/nerdtree',
"preservim/nerdtree",
-- Detect tabstop and shiftwidth automatically
--'tpope/vim-sleuth',
@@ -454,32 +454,32 @@ require('lazy').setup({
},
-- Useful plugin to show you pending keybinds.
{ 'folke/which-key.nvim', opts = {} },
{ "folke/which-key.nvim", opts = {} },
{
-- Adds git releated signs to the gutter, as well as utilities for managing changes
'lewis6991/gitsigns.nvim',
"lewis6991/gitsigns.nvim",
opts = {
-- See `:help gitsigns.txt`
signs = {
add = { text = '+' },
change = { text = '~' },
delete = { text = '_' },
topdelete = { text = '‾' },
changedelete = { text = '~' },
add = { text = "+" },
change = { text = "~" },
delete = { text = "_" },
topdelete = { text = "‾" },
changedelete = { text = "~" },
},
},
},
{
'morhetz/gruvbox',
"morhetz/gruvbox",
priority = 1000,
config = function()
vim.cmd.colorscheme 'gruvbox'
vim.cmd.colorscheme("gruvbox")
end,
},
{
'catppuccin/nvim',
"catppuccin/nvim",
priority = 1000,
-- config = function()
-- vim.cmd.colorscheme "catppuccin"
@@ -488,33 +488,33 @@ require('lazy').setup({
{
-- Set lualine as statusline
'nvim-lualine/lualine.nvim',
"nvim-lualine/lualine.nvim",
-- See `:help lualine.txt`
opts = {
options = {
icons_enabled = false,
theme = 'gruvbox',
component_separators = '|',
section_separators = '',
theme = "gruvbox",
component_separators = "|",
section_separators = "",
},
},
},
-- Multi-cursor
{
'mg979/vim-visual-multi',
branch = 'master',
"mg979/vim-visual-multi",
branch = "master",
},
{
-- Add indentation guides even on blank lines
'lukas-reineke/indent-blankline.nvim',
"lukas-reineke/indent-blankline.nvim",
main = "ibl",
opts = {},
},
-- "gc" to comment visual regions/lines
{ 'numToStr/Comment.nvim', opts = {} },
{ "numToStr/Comment.nvim", opts = {} },
{ -- Fuzzy Finder (files, lsp, etc)
"nvim-telescope/telescope.nvim",
@@ -624,19 +624,19 @@ require('lazy').setup({
-- Only load if `make` is available. Make sure you have the system
-- requirements installed.
{
'nvim-telescope/telescope-fzf-native.nvim',
"nvim-telescope/telescope-fzf-native.nvim",
-- NOTE: If you are having trouble with this installation,
-- refer to the README for telescope-fzf-native for more instructions.
build = 'make',
build = "make",
cond = function()
return vim.fn.executable 'make' == 1
return vim.fn.executable("make") == 1
end,
},
{ -- Highlight, edit, and navigate code
"nvim-treesitter/nvim-treesitter",
build = ":TSUpdate",
main = "nvim-treesitter.configs", -- Sets main module to use for opts
main = "nvim-treesitter.config", -- Sets main module to use for opts
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
opts = {
ensure_installed = {
@@ -673,12 +673,12 @@ require('lazy').setup({
},
{
'SirVer/ultisnips'
"SirVer/ultisnips",
},
{ 'karolbelina/uxntal.vim' },
{ "karolbelina/uxntal.vim" },
{ 'kaarmu/typst.vim' },
{ "kaarmu/typst.vim" },
{
"pmizio/typescript-tools.nvim",
@@ -735,106 +735,87 @@ require('lazy').setup({
},
{
'fatih/vim-go',
build = ':GoUpdateBinaries',
"fatih/vim-go",
build = ":GoUpdateBinaries",
},
{ 'rust-lang/rust.vim' },
{ 'Julian/lean.nvim' },
{ 'Omnisharp/omnisharp-vim' },
{ "rust-lang/rust.vim" },
{ "Julian/lean.nvim" },
{ "Omnisharp/omnisharp-vim" },
-- Google Java auto-format
{
'google/vim-codefmt',
"google/vim-codefmt",
dependencies = {
'google/vim-maktaba',
'google/vim-glaive',
"google/vim-maktaba",
"google/vim-glaive",
},
},
{ 'psf/black' },
{ "psf/black" },
{ 'lervag/vimtex' },
{ 'KeitaNakamura/tex-conceal.vim' },
{ "lervag/vimtex" },
{ "KeitaNakamura/tex-conceal.vim" },
{ 'tpope/vim-fugitive' },
{ 'tpope/vim-rhubarb' },
{ 'lewis6991/gitsigns.nvim' },
-- 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.
-- Uncomment any of the lines below to enable them.
require 'kickstart.plugins.autoformat',
-- require 'kickstart.plugins.debug',
-- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-- You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
-- up-to-date with whatever is in the kickstart repo.
--
-- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
--
-- An additional note is that if you only copied in the `init.lua`, you can just comment this line
-- to get rid of the warning telling you that there are not plugins in `lua/custom/plugins/`.
--{ import = 'custom.plugins' },
{ "tpope/vim-fugitive" },
{ "tpope/vim-rhubarb" },
{ "lewis6991/gitsigns.nvim" },
}, {})
-- LaTeX specific commands
local texfiles = vim.api.nvim_create_augroup('texfiles', { clear = true })
vim.api.nvim_create_autocmd('FileType', {
command = 'setlocal spell colorcolumn=81 tw=80 conceallevel=1',
local texfiles = vim.api.nvim_create_augroup("texfiles", { clear = true })
vim.api.nvim_create_autocmd("FileType", {
command = "setlocal spell colorcolumn=81 tw=80 conceallevel=1",
group = texfiles,
pattern = { 'tex' },
pattern = { "tex" },
})
-- Typst
local typstfiles = vim.api.nvim_create_augroup('typstfiles', { clear = true })
vim.api.nvim_create_autocmd('FileType', {
command = 'setlocal spell',
local typstfiles = vim.api.nvim_create_augroup("typstfiles", { clear = true })
vim.api.nvim_create_autocmd("FileType", {
command = "setlocal spell",
group = typstfiles,
pattern = { 'typst' },
pattern = { "typst" },
})
-- Promela
local promelafiles = vim.api.nvim_create_augroup('promelafiles', { clear = true })
vim.api.nvim_create_autocmd('FileType', {
command = 'setlocal commentstring=//%s',
local promelafiles = vim.api.nvim_create_augroup("promelafiles", { clear = true })
vim.api.nvim_create_autocmd("FileType", {
command = "setlocal commentstring=//%s",
group = promelafiles,
pattern = { 'promela' },
pattern = { "promela" },
})
-- Autoformatting commands
local autoformats = vim.api.nvim_create_augroup(
'autoformat_settings',
{ clear = true }
)
vim.api.nvim_create_autocmd('FileType', {
command = 'AutoFormatBuffer google-java-format',
local autoformats = vim.api.nvim_create_augroup("autoformat_settings", { clear = true })
vim.api.nvim_create_autocmd("FileType", {
command = "AutoFormatBuffer google-java-format",
group = autoformats,
pattern = { 'java' },
pattern = { "java" },
})
vim.api.nvim_create_autocmd('BufWritePre', {
command = 'Black',
vim.api.nvim_create_autocmd("BufWritePre", {
command = "Black",
group = autoformats,
pattern = { '*.py' },
pattern = { "*.py" },
})
vim.api.nvim_create_autocmd('BufWritePre', {
command = 'FormatCode',
vim.api.nvim_create_autocmd("BufWritePre", {
command = "FormatCode",
group = autoformats,
pattern = { '*.c' },
pattern = { "*.c" },
})
-- Filetype Detection
vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
command = 'set filetype=mips',
pattern = { '*.asm' },
vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
command = "set filetype=mips",
pattern = { "*.asm" },
})
vim.api.nvim_create_autocmd('BufRead', {
command = 'set filetype=lean',
pattern = { '*.lean' },
vim.api.nvim_create_autocmd("BufRead", {
command = "set filetype=lean",
pattern = { "*.lean" },
})
vim.g.tex_conceal = 'abdmg'
vim.cmd.highlight({ 'Conceal', 'ctermbg=none' })
vim.g.tex_conceal = "abdmg"
vim.cmd.highlight({ "Conceal", "ctermbg=none" })
-- Settings for Plugins
@@ -853,7 +834,7 @@ vim.g.rustfmt_emit_files = 1
vim.g.rustfmt_fail_silently = 0
-- OmniSharp options
vim.g.OmniSharp_server_path = '/usr/bin/omnisharp-mono'
vim.g.OmniSharp_server_path = "/usr/bin/omnisharp-mono"
-- UltiSnips keybindings
vim.g.UltiSnipsExpandTrigger = "<tab>"
@@ -861,17 +842,17 @@ vim.g.UltiSnipsJumpForwardTrigger = "<c-b>"
vim.g.UltiSnipsJumpBackwardTrigger = "<c-z>"
-- Vimtex configuration
vim.g.vimtex_view_method = 'zathura'
vim.g.vimtex_view_method = "zathura"
vim.g.vimtex_quickfix_mode = 0
vim.g.vimtex_compiler_latexmk = {
options = {
'-latex=lualatex',
'-shell-escape',
'-verbose',
'-file-line-error',
'-synctex=1',
'-interaction=nonstopmode',
}
"-latex=lualatex",
"-shell-escape",
"-verbose",
"-file-line-error",
"-synctex=1",
"-interaction=nonstopmode",
},
}
vim.g.python_highlight_all = 1
@@ -883,280 +864,69 @@ vim.o.termguicolors = true
-- Set <space> as the leader key
-- See `:help mapleader`
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
vim.g.mapleader = " "
vim.g.maplocalleader = " "
-- Keymaps for better default experience
-- See `:help vim.keymap.set()`
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { silent = true })
-- Remap for dealing with word wrap
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-- [[ Highlight on yank ]]
-- See `:help vim.highlight.on_yank()`
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
vim.api.nvim_create_autocmd('TextYankPost', {
local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
vim.api.nvim_create_autocmd("TextYankPost", {
callback = function()
vim.highlight.on_yank()
end,
group = highlight_group,
pattern = '*',
pattern = "*",
})
-- Set lualine as statusline
-- See `:help lualine.txt`
require('lualine').setup {
require("lualine").setup({
options = {
icons_enabled = false,
theme = 'gruvbox',
component_separators = '|',
section_separators = '',
theme = "gruvbox",
component_separators = "|",
section_separators = "",
},
}
})
-- Enable Comment.nvim
require('Comment').setup()
require("Comment").setup()
-- Enable `lukas-reineke/indent-blankline.nvim`
-- See `:help indent_blankline.txt`
require('ibl').setup {
indent = { char = '┊' },
}
require("ibl").setup({
indent = { char = "┊" },
})
-- Gitsigns
-- See `:help gitsigns.txt`
require('gitsigns').setup {
require("gitsigns").setup({
signs = {
add = { text = '+' },
change = { text = '~' },
delete = { text = '_' },
topdelete = { text = '‾' },
changedelete = { text = '~' },
add = { text = "+" },
change = { text = "~" },
delete = { text = "_" },
topdelete = { text = "‾" },
changedelete = { text = "~" },
},
}
})
-- [[ Configure Telescope ]]
-- See `:help telescope` and `:help telescope.setup()`
require('telescope').setup {
require("telescope").setup({
defaults = {
mappings = {
i = {
['<C-u>'] = false,
['<C-d>'] = false,
["<C-u>"] = false,
["<C-d>"] = false,
},
},
},
}
-- Enable telescope fzf native, if installed
pcall(require('telescope').load_extension, 'fzf')
-- See `:help telescope.builtin`
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
vim.keymap.set('n', '<leader>/', function()
-- You can pass additional configuration to telescope to change theme, layout, etc.
require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
winblend = 10,
previewer = false,
})
end, { desc = '[/] Fuzzily search in current buffer]' })
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
-- Diagnostic keymaps
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
-- LSP settings.
-- This function gets run when an LSP connects to a particular buffer.
local on_attach = function(client, bufnr)
-- Omnisharp requires a workaround due to its non-conformance with the LSP spec
-- https://github.com/OmniSharp/omnisharp-roslyn/issues/2483
if client.name == "omnisharp" or client.name == "omnisharp_mono" then
client.server_capabilities.semanticTokensProvider = {
full = vim.empty_dict(),
legend = {
tokenModifiers = { "static_symbol" },
tokenTypes = {
"comment",
"excluded_code",
"identifier",
"keyword",
"keyword_control",
"number",
"operator",
"operator_overloaded",
"preprocessor_keyword",
"string",
"whitespace",
"text",
"static_symbol",
"preprocessor_text",
"punctuation",
"string_verbatim",
"string_escape_character",
"class_name",
"delegate_name",
"enum_name",
"interface_name",
"module_name",
"struct_name",
"type_parameter_name",
"field_name",
"enum_member_name",
"constant_name",
"local_name",
"parameter_name",
"method_name",
"extension_method_name",
"property_name",
"event_name",
"namespace_name",
"label_name",
"xml_doc_comment_attribute_name",
"xml_doc_comment_attribute_quotes",
"xml_doc_comment_attribute_value",
"xml_doc_comment_cdata_section",
"xml_doc_comment_comment",
"xml_doc_comment_delimiter",
"xml_doc_comment_entity_reference",
"xml_doc_comment_name",
"xml_doc_comment_processing_instruction",
"xml_doc_comment_text",
"xml_literal_attribute_name",
"xml_literal_attribute_quotes",
"xml_literal_attribute_value",
"xml_literal_cdata_section",
"xml_literal_comment",
"xml_literal_delimiter",
"xml_literal_embedded_expression",
"xml_literal_entity_reference",
"xml_literal_name",
"xml_literal_processing_instruction",
"xml_literal_text",
"regex_comment",
"regex_character_class",
"regex_anchor",
"regex_quantifier",
"regex_grouping",
"regex_alternation",
"regex_text",
"regex_self_escaped_character",
"regex_other_escape",
},
},
range = true,
}
end
-- NOTE: Remember that lua is a real programming language, and as such it is possible
-- to define small helper and utility functions so you don't have to repeat yourself
-- many times.
--
-- In this case, we create a function that lets us more easily define mappings specific
-- for LSP related items. It sets the mode, buffer and description for us each time.
local nmap = function(keys, func, desc)
if desc then
desc = 'LSP: ' .. desc
end
vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
end
nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-- See `:help K` for why this keymap
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
-- Lesser used LSP functionality
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
nmap('<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, '[W]orkspace [L]ist Folders')
-- Create a command `:Format` local to the LSP buffer
vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
vim.lsp.buf.format()
end, { desc = 'Format current buffer with LSP' })
end
-- Enable the following language servers
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
--
-- Add any additional override configuration in the following tables. They will be passed to
-- the `settings` field of the server config. You must look up that documentation yourself.
local servers = {
gopls = {},
lua_ls = {
Lua = {
workspace = { checkThirdParty = false },
telemetry = { enable = false },
},
},
rust_analyzer = {
["rust-analyzer"] = {
cargo = {
allFeatures = true,
},
completion = {
postfix = {
enable = false,
},
},
},
},
jdtls = {},
omnisharp_mono = {},
hls = {},
}
vim.lsp.inlay_hint.enable()
-- Diagnostic Config
-- See :help vim.diagnostic.Opts
vim.diagnostic.config {
severity_sort = true,
float = { border = 'rounded', source = 'if_many' },
underline = { severity = vim.diagnostic.severity.ERROR },
signs = vim.g.have_nerd_font and {
text = {
[vim.diagnostic.severity.ERROR] = '󰅚 ',
[vim.diagnostic.severity.WARN] = '󰀪 ',
[vim.diagnostic.severity.INFO] = '󰋽 ',
[vim.diagnostic.severity.HINT] = '󰌶 ',
},
} or {},
virtual_text = {
source = 'if_many',
spacing = 2,
format = function(diagnostic)
local diagnostic_message = {
[vim.diagnostic.severity.ERROR] = diagnostic.message,
[vim.diagnostic.severity.WARN] = diagnostic.message,
[vim.diagnostic.severity.INFO] = diagnostic.message,
[vim.diagnostic.severity.HINT] = diagnostic.message,
}
return diagnostic_message[diagnostic.severity]
end,
},
}
})
nvim/.config/nvim/lazy-lock.json
+1 -1
View File
@@ -18,7 +18,7 @@
"nerdtree": { "branch": "master", "commit": "690d061b591525890f1471c6675bcb5bdc8cdff9" },
"nvim": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
"nvim-lspconfig": { "branch": "master", "commit": "31026a13eefb20681124706a79fc1df6bf11ab27" },
"nvim-treesitter": { "branch": "main", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-web-devicons": { "branch": "master", "commit": "4fc505ac7bd7692824a142e96e5f529c133862f8" },
"omnisharp-vim": { "branch": "master", "commit": "1e1d65e05ad2bd466851246654d28c91864ab2e7" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },