From e4f0c2cf125fc42b8b586100ce6030bd69121d7d Mon Sep 17 00:00:00 2001
From: Yaroslav de la Peña Smirnov <yps@yaroslavps.com>
Date: Wed, 15 Apr 2026 12:35:17 +0300
Subject: changes for nvim 0.12

---
 dotfiles/.config/nvim/init.vim | 19 ++++++++-----------
 dotfiles/.config/nvim/lua.lua  | 32 +++++++++++---------------------
 2 files changed, 19 insertions(+), 32 deletions(-)

(limited to 'dotfiles/.config/nvim')

diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim
index d9820bc..4f736e8 100644
--- a/dotfiles/.config/nvim/init.vim
+++ b/dotfiles/.config/nvim/init.vim
@@ -34,9 +34,6 @@ call plug#begin('~/.local/share/nvim/site/plugged')
 		Plug 'neovim/nvim-lspconfig'
 		Plug 'ojroques/nvim-lspfuzzy'
 	endif
-	if has('nvim-0.9')
-		Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-	endif
 call plug#end()
 
 " Some basics:
@@ -90,7 +87,7 @@ call plug#end()
 	endfunction
 	function! StatuslineGit()
 	let l:branchname = GitBranch()
-	return strlen(l:branchname) > 0?'   '.l:branchname.' ':''
+	return strlen(l:branchname) > 0?'  '.l:branchname.' ':''
 	endfunction
 
 " git-messenger settings
@@ -101,17 +98,17 @@ call plug#end()
 	hi! link diffWordsAdded DiffText
 	hi! link diffWordsRemoved DiffText
 
-" Statusline
+" Statusline FIXME:
 	let laststatus=2
-	set statusline=
+	" set statusline=
 	set statusline+=%#SignColumn#
 	set statusline+=%{StatuslineGit()}
 	set statusline+=%#StatusLine#
-	set statusline+=%<
-	set statusline+=\ %f%r%m
-	set statusline+=%=
-	set statusline+=\ %l/%L,%c%V
-	set statusline+=\ 
+	" set statusline+=%<
+	" set statusline+=\ %f%r%m
+	" set statusline+=%=
+	" set statusline+=\ %l/%L,%c%V
+	" set statusline+=\ 
 	set statusline+=%#StatusLineNC#
 	set statusline+=\ %Y
 	set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
diff --git a/dotfiles/.config/nvim/lua.lua b/dotfiles/.config/nvim/lua.lua
index 58ed5a7..5b0ddf2 100644
--- a/dotfiles/.config/nvim/lua.lua
+++ b/dotfiles/.config/nvim/lua.lua
@@ -6,30 +6,20 @@ local on_attach = function(client, _)
   client.request = require('lspfuzzy').wrap_request(client.request)
 end
 vim.lsp.config('*', {on_attach = on_attach})
+vim.lsp.config('clangd', {
+		on_attach = on_attach,
+		filetypes = { "c", "cpp", "objc", "objcpp", "ch" },
+		init_options = { fallbackFlags = {  } },
+	})
 
-lspconfig.clangd.setup{
-	filetypes = { "c", "cpp", "objc", "objcpp", "ch" },
-	on_attach = on_attach,
-	init_options = {
-		fallbackFlags = { '--std=c23' },
-	},
-}
-lspconfig.gopls.setup{on_attach = on_attach}
-lspconfig.pylsp.setup{on_attach = on_attach}
-lspconfig.rust_analyzer.setup{on_attach = on_attach}
-lspconfig.quick_lint_js.setup{on_attach = on_attach}
-lspconfig.zls.setup{on_attach = on_attach}
+vim.lsp.enable('clangd')
+vim.lsp.enable('gopls')
+vim.lsp.enable('pylsp')
+vim.lsp.enable('rust_analyzer')
+vim.lsp.enable('quick_lint_js')
+vim.lsp.enable('zls')
 require('lspfuzzy').setup{}
 
-if vim.fn.has('nvim-0.9') then
-	-- XXX: neovim's built-in C et al treesitter parsers are better, although
-	-- not ideal either.
-	require('nvim-treesitter.configs').setup{
-		ensure_installed = { "go", "proto", "rust", "python", "lua", "comment", "zig" },
-		highlight = { enable = true, disable = { "c", "cpp", "vim", "make" } },
-	}
-end
-
 local lsp_icons = {
   Class = " ",
   Color = " ",
-- 
cgit v1.3