Skip to content

Commit 835afd4

Browse files
committed
fix(nvim): use canonical solarized + actually install treesitter parsers
- plugins.lua: replace maxmx03/solarized.nvim with altercation/vim-colors-solarized (the same colorscheme vim already uses via Vundle). Run with termguicolors=false so the terminal's solarized 16-color palette is used directly. solarized.nvim's truecolor reinterpretation was leaning on magenta/violet/cyan accents and reading as "pink/purple/teal" instead of classic solarized. - treesitter.lua: enable `build = ":TSUpdate"` so parsers actually compile on plugin install/update. Without it, ensure_installed was a no-op and treesitter highlighting (incl. markdown code-block injection) silently did nothing. - packages.txt: add tree-sitter-cli — required by nvim-treesitter to build parsers; the brew tree-sitter formula was split into lib-only.
1 parent 80449e1 commit 835afd4

4 files changed

Lines changed: 23 additions & 16 deletions

File tree

nvim/lazy-lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
66
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
77
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
8-
"gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
8+
"gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
99
"glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" },
1010
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
1111
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
@@ -14,7 +14,7 @@
1414
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
1515
"nvim-treesitter-context": { "branch": "master", "commit": "b0c45cefe2c8f7b55fc46f34e563bc428ef99636" },
1616
"rustaceanvim": { "branch": "main", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
17-
"solarized.nvim": { "branch": "main", "commit": "a8085e29883ddcfb39bd46197eb32ef00df05368" },
17+
"vim-colors-solarized": { "branch": "master", "commit": "528a59f26d12278698bb946f8fb82a63711eec21" },
1818
"vim-mundo": { "branch": "master", "commit": "2ceda8c65f7b3f9066820729fc02003a09df91f9" },
1919
"vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" }
2020
}

nvim/lua/plugins.lua

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
return {
22
-- Apparently requires Lua 5.1 and we have 5.4?
33
-- "nvim-neorocks/rocks.nvim",
4+
5+
-- Reuse the canonical Ethan Schoonover solarized colorscheme that vim
6+
-- already uses (~/.vim/bundle/vim-colors-solarized via Vundle). Treesitter
7+
-- groups inherit from the legacy syntax groups, which keeps the palette
8+
-- tight (no surprise pink/purple/teal accents).
49
{
5-
'maxmx03/solarized.nvim',
10+
'altercation/vim-colors-solarized',
611
lazy = false,
712
priority = 1000,
8-
---@type solarized.config
9-
opts = {},
10-
config = function(_, opts)
11-
vim.o.termguicolors = true
13+
config = function()
14+
-- 16-color terminal palette mode honors the terminal's solarized
15+
-- palette directly (no truecolor reinterpretation by nvim).
16+
vim.o.termguicolors = false
1217
vim.o.background = 'dark'
13-
require('solarized').setup(opts)
18+
vim.g.solarized_termtrans = 1
1419
vim.cmd.colorscheme 'solarized'
1520
end,
1621
},

nvim/lua/plugins/treesitter.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
return {
22
{
33
"nvim-treesitter/nvim-treesitter",
4-
-- build = ":TSUpdate",
4+
build = ":TSUpdate",
55
event = { "BufReadPost", "BufNewFile", "VeryLazy" },
66
cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" },
77
dependencies = {

packages.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ vim required vim vim vim-enhanced vim
1919
nvim required neovim neovim neovim neovim
2020

2121
# --- optional ---
22-
tmux optional tmux tmux tmux tmux
23-
fzf optional fzf fzf fzf fzf
24-
rg optional ripgrep ripgrep ripgrep ripgrep
25-
fd optional fd fd-find fd-find fd
26-
bat optional bat bat bat bat
27-
eza optional eza eza eza eza
28-
shellcheck optional shellcheck shellcheck ShellCheck shellcheck
22+
tmux optional tmux tmux tmux tmux
23+
fzf optional fzf fzf fzf fzf
24+
rg optional ripgrep ripgrep ripgrep ripgrep
25+
fd optional fd fd-find fd-find fd
26+
bat optional bat bat bat bat
27+
eza optional eza eza eza eza
28+
shellcheck optional shellcheck shellcheck ShellCheck shellcheck
29+
# Required by nvim-treesitter to compile parsers (`:TSInstall`/`:TSUpdate`).
30+
tree-sitter optional tree-sitter-cli tree-sitter-cli tree-sitter-cli tree-sitter-cli
2931

3032
# --- macOS-only optional (GNU coreutils for solarized dircolors) ---
3133
# gls / gdircolors are both provided by the brew "coreutils" package; on Linux

0 commit comments

Comments
 (0)