nvim

home.nix

@@ -44,6 +44,23 @@ in
     tldr
     biome
     dive
+    nodejs_24
+
+    # LSP Executables
+    nixd
+    nixfmt-rfc-style
+    efm-langserver # Generic language server
+    lua-language-server # Lua lsp
+    gopls # Go lsp
+    # lexical # Elixir lsp
+    shellcheck
+    nodePackages.intelephense # PHP lsp
+    nodePackages.typescript-language-server
+    nodePackages.svelte-language-server
+    nodePackages.bash-language-server
+    prettierd
+    eslint_d
+    zls
   ];
 
   fonts.fontconfig.enable = true;
@@ -76,23 +93,6 @@ in
     enable = true;
     defaultEditor = true;
     package = pkgs.neovim;
-    extraPackages = [
-      pkgs.nixd
-      pkgs.nixfmt-rfc-style
-      pkgs.efm-langserver # Generic language server
-      pkgs.lua-language-server # Lua lsp
-      pkgs.gopls # Go lsp
-      pkgs.lexical # Elixir lsp
-      pkgs.shellcheck
-      pkgs.nodePackages.intelephense # PHP lsp
-      pkgs.nodePackages.typescript-language-server
-      pkgs.nodePackages.svelte-language-server
-      pkgs.nodePackages.bash-language-server
-      pkgs.prettierd
-      pkgs.eslint_d
-      pkgs.zls
-      pkgs.nodejs_24
-    ];
   };
 
   programs.direnv = {

nvim/ftplugin/elixir.lua

@@ -1 +0,0 @@
-vim.treesitter.start()

nvim/ftplugin/go.lua

@@ -1 +0,0 @@
-vim.treesitter.start()

nvim/ftplugin/html.lua

@@ -1 +0,0 @@
-vim.treesitter.start()

nvim/ftplugin/php.lua

@@ -1 +0,0 @@
-vim.treesitter.start()

nvim/ftplugin/svelte.lua

@@ -1 +0,0 @@
-vim.treesitter.start()

nvim/init.lua

@@ -106,3 +106,24 @@ vim.api.nvim_create_user_command("FormatEnable", function()
 end, {
     desc = "Re-enable autoformat-on-save",
 })
+
+-- Enable treesitter
+
+local fts = {
+    "php",
+    "javascript",
+    "typescript",
+    "lua",
+    "go",
+    "elixir",
+    "heex",
+}
+
+vim.api.nvim_create_autocmd('FileType', {
+    pattern = fts,
+    callback = function()
+        vim.treesitter.start()
+        vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+    end,
+})