From e0a20b65f7bbfce2aea9160fa54fd0ecb160355b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Wed, 28 Jan 2026 10:45:07 +0100
Subject: [PATCH] neovim: fix config

---
 home/editor/neovim/default.nix | 35 +++++++++++++++++-----------------
 home/editor/neovim/plugins.lua |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/home/editor/neovim/default.nix b/home/editor/neovim/default.nix
index e519ec6..5f9bac6 100644
--- a/home/editor/neovim/default.nix
+++ b/home/editor/neovim/default.nix
@@ -9,23 +9,24 @@
         nodePackages_latest.nodejs
       ];
       plugins = with pkgs.vimPlugins; [
-        vim-fugitive
-        undotree
-        telescope-nvim
-        nvim-cmp
-        cmp-nvim-lsp
-        nvim-lspconfig
-        lsp-zero-nvim
-        vim-floaterm
-        luasnip
-        cmp_luasnip
-        lualine-nvim
-        vim-sleuth
-        copilot-lua
-        copilot-cmp
-        cmp-cmdline
-        cmp-buffer
         catppuccin-nvim
+        cmp-buffer
+        cmp-cmdline
+        cmp-nvim-lsp
+        cmp_luasnip
+        copilot-cmp
+        copilot-lua
+        lsp-zero-nvim
+        lualine-nvim
+        luasnip
+        nvim-cmp
+        nvim-lspconfig
+        plenary-nvim
+        telescope-nvim
+        undotree
+        vim-floaterm
+        vim-fugitive
+        vim-sleuth
         (nvim-treesitter.withPlugins (p: [
           p.tree-sitter-yaml
           p.tree-sitter-nix
@@ -42,7 +43,7 @@
           p.tree-sitter-markdown-inline
         ]))
       ];
-      extraLuaConfig = ''
+      initLua = ''
         ${builtins.readFile ./plugins.lua}
         ${builtins.readFile ./options.lua}
         ${builtins.readFile ./keybinds.lua}
diff --git a/home/editor/neovim/plugins.lua b/home/editor/neovim/plugins.lua
index 91eeba0..d17769f 100644
--- a/home/editor/neovim/plugins.lua
+++ b/home/editor/neovim/plugins.lua
@@ -188,7 +188,7 @@ require('telescope').setup({
 })
 
 -- Tresitter stuff
-require('nvim-treesitter.configs').setup {
+require('nvim-treesitter').setup {
 	ensure_installed = {},
 	auto_install = false,
 	highlight = { enable = true },