From 9533c3e511e8a8fbb0f7aaa0d0891cec20898cf9 Mon Sep 17 00:00:00 2001
From: Jon Santmyer <jon@jonsantmyer.com>
Date: Fri, 6 Nov 2026 10:28:46 -0500
Subject: 2026-11-06 laptop

---
 modules/desktop/apps/editors/neovim.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'modules/desktop/apps/editors')

diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix
index e3bb02e..e719565 100644
--- a/modules/desktop/apps/editors/neovim.nix
+++ b/modules/desktop/apps/editors/neovim.nix
@@ -26,6 +26,7 @@ in {
             pkgs.texlab
             pkgs.zls
             pkgs.wgsl-analyzer
+    	    pkgs.clang-tools
         ];
 
         home.manager.programs.neovim = {
@@ -50,7 +51,7 @@ in {
                 "nix.serverPath" = "nil";
 
                 "zig.enabled" = true;
-                "zig.path" = "${pkgs.zls}/bin/zls";
+                "zig.path" = "zls";
 
                 "languageserver" = {
                     "wgsl" = {
@@ -72,9 +73,24 @@ in {
                 plenary-nvim
                 telescope-nvim
                 wgsl-vim
+                zig-vim
 
                 nvim-lspconfig
-                nvim-treesitter nvim-treesitter.withAllGrammars
+                {
+                    plugin = nvim-treesitter.withAllGrammars;
+                    type = "lua";
+                    config = ''
+                        require('nvim-treesitter.config').setup {
+                            highlight = { enable = true },
+                            indent = { enable = true },
+                        }
+                        vim.api.nvim_create_autocmd('FileType', {
+                            pattern = { 'c', 'h', 'lua', 'nix', 'mk', 'zig' },
+                            callback = function() vim.treesitter.start() end,
+                        })
+                        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+                    '';
+                }
 
                 coc-clangd
                 coc-rust-analyzer
-- 
cgit v1.2.3