From df0b29e1d5d1d902a30493cd1bd0707f8e13bb63 Mon Sep 17 00:00:00 2001 From: Spencer Gilbert Date: Mon, 24 Aug 2026 23:42:20 -0400 Subject: [PATCH] [mise,nvim] Add gcc for tree-sitter CLI parser compilation, pin tree-sitter-cli@0.22.6, remove telescope-fzf-native --- mise.linux.toml | 1 + mise.toml | 1 + nvim/init.lua | 30 ++++++++++++++++++++++++++---- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/mise.linux.toml b/mise.linux.toml index 2828ae3..1c6c3fe 100644 --- a/mise.linux.toml +++ b/mise.linux.toml @@ -6,6 +6,7 @@ run = "mise run setup-dnf-repos" "dnf:1password-cli" = "latest" "dnf:fish" = "latest" "dnf:ghostty" = "latest" +"dnf:gcc" = "latest" [dotfiles] "~/.config/mise/config.linux.toml" = "mise.linux.toml" diff --git a/mise.toml b/mise.toml index f8fb755..3af9b38 100644 --- a/mise.toml +++ b/mise.toml @@ -37,5 +37,6 @@ node = "lts" pi = "latest" ripgrep = "latest" starship = "latest" +"npm:tree-sitter-cli" = "0.22.6" uv = "latest" zoxide = "latest" diff --git a/nvim/init.lua b/nvim/init.lua index 3702826..2c146e5 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -4,10 +4,10 @@ vim.g.maplocalleader = ' ' -- Plugins managed by vim.pack (installed to $XDG_DATA_HOME/nvim/site/pack/core/opt) vim.pack.add { - { src = 'https://github.com/catppuccin/nvim', name = 'catppuccin' }, - { src = 'https://github.com/nvim-treesitter/nvim-treesitter', name = 'nvim-treesitter' }, - { src = 'https://github.com/nvim-telescope/telescope.nvim', name = 'telescope' }, - { src = 'https://github.com/nvim-telescope/telescope-fzf-native.nvim', name = 'telescope-fzf-native' }, + { src = 'https://github.com/catppuccin/nvim', name = 'catppuccin' }, + { src = 'https://github.com/nvim-treesitter/nvim-treesitter', name = 'nvim-treesitter' }, + { src = 'https://github.com/nvim-lua/plenary.nvim', name = 'plenary' }, + { src = 'https://github.com/nvim-telescope/telescope.nvim', name = 'telescope' }, } -- Custom filetype detection @@ -16,6 +16,28 @@ require('filetypes.helm') -- Colorscheme (must load after plugins that define highlight groups) vim.cmd.colorscheme('catppuccin-frappe') +-- Treesitter: install parsers for these languages, enable folding on filetype +treesitter_languages = { + 'lua', 'go', 'yaml', 'helm', 'bash', 'json', 'toml', 'markdown', 'markdown_inline', +} +require('nvim-treesitter').setup {} +for _, lang in ipairs(treesitter_languages) do + require('nvim-treesitter').install({ lang }) +end +vim.api.nvim_create_autocmd('FileType', { + group = vim.api.nvim_create_augroup('treesitter_enable', { clear = true }), + pattern = treesitter_languages, + callback = function(ev) + if pcall(vim.treesitter.start, ev.buf) then + vim.wo[ev.buf].foldexpr = 'v:lua.vim.treesitter.foldexpr()' + vim.wo[ev.buf].foldmethod = 'expr' + end + end, +}) + +-- Telescope: setup with reasonable defaults +require('telescope').setup {} + -- OPTIONS vim.o.number = true -- 2.51.2