Disable avante; fix treesitter config

home/sam/home.nix

@@ -34,26 +34,40 @@
     enableZshIntegration = true;
   };
 
+
+  programs.zellij = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
   programs.atuin = {
     enable = true;
     enableZshIntegration = true;
   };
 
   programs.kitty.enable = true;
-
-  programs.git.enable = true;
+  programs.git = {
+    enable = true;
+    userName = "sam";
+    userEmail = "samuelrolfe@gmail.com";
+  };
   programs.gh.enable = true;
 
-  # Neovim Option 1: keep your config + lazy.nvim (downloads plugins),
-  # but Nix provides all the runtime deps (node/python/rg/fd/etc).
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    withNodeJs = true;
-    withPython3 = true;
-  };
 
+programs.neovim = {
+  enable = true;
+  viAlias = true;
+  vimAlias = true;
+  withNodeJs = true;
+  withPython3 = true;
+};
+
+
+
+
+  # Link the config, recursive ensures it is readable
+  xdg.configFile."nvim/init.lua".source = ./nvim/init.lua;
+  xdg.configFile."nvim/lua".source = ./nvim/lua;
   home.packages = with pkgs; [
     nodejs
     python3
@@ -67,6 +81,4 @@
   # Hyprland minimal config so it is usable immediately
   xdg.configFile."hypr/hyprland.conf".source = ./../sam/hypr/hyprland.conf;
 
-  # Neovim config stored in this repo
-  xdg.configFile."nvim".source = ./nvim;
 }

home/sam/nvim/lua/sam/lazy.lua

@@ -1,17 +1,21 @@
--- ~/.config/nvim/lua/sam/lazy.lua
-
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   vim.fn.system({
     "git",
     "clone",
     "--filter=blob:none",
     "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
+    "--branch=stable",
     lazypath,
   })
 end
+
 vim.opt.rtp:prepend(lazypath)
 
--- Tell lazy to load our plugin specs from the "plugins" directory
-require("lazy").setup("sam.plugins", {})
+require("lazy").setup("sam.plugins", {
+  -- Force plugin installation on new machines:
+  install = { missing = true },
+
+  -- Put lockfile somewhere writable:
+  lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json",
+})

home/sam/nvim/lua/sam/plugins/treesitter.lua

@@ -1,11 +1,21 @@
--- ~/.config/nvim/lua/sam/plugins/treesitter.lua
-
 return {
   "nvim-treesitter/nvim-treesitter",
-  build = ":TSUpdate", -- Installs and updates parsers
+  build = ":TSUpdate",
   config = function()
-    require("nvim-treesitter.configs").setup({
-      -- A list of parser names, or "all"
+    -- treesitter renamed configs -> config in newer versions
+    local ok, ts = pcall(require, "nvim-treesitter.config")
+    if not ok then
+      ok, ts = pcall(require, "nvim-treesitter.configs")
+    end
+    if not ok then
+      vim.notify(
+        "nvim-treesitter: config module not found",
+        vim.log.levels.ERROR
+      )
+      return
+    end
+
+    ts.setup({
       ensure_installed = {
         "c",
         "cpp",
@@ -21,16 +31,9 @@ return {
         "json",
         "php",
       },
-
-      -- Install parsers synchronously (only applied on startup)
       sync_install = false,
-
-      -- Automatically install missing parsers when entering buffer
       auto_install = true,
-
-      highlight = {
-        enable = true,
-      },
+      highlight = { enable = true },
     })
   end,
 }