nvim: Fix tree-sitter compilation

There seems to be an issue with clang, so let's use gcc (for now)

config/nvim/lua/nifoc/config/treesitter.lua

@@ -18,7 +18,7 @@ treesitter.define_modules {
 }
 
 treesitter_config.setup {
-  ensure_installed = false,
+  ensure_installed = 'maintained',
   highlight = {
     enable = true,
   },

home.nix

@@ -66,6 +66,8 @@
         echo 'Done'
         echo -n 'Running LuaCacheClear: '
         nvim -c 'try | execute "LuaCacheClear" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
+        printf '\nRunning TSUpdateSync ... '
+        nvim -c 'try | execute "TSUpdateSync" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
         printf '\n'
       '';
 

programs/nvim/default.nix

@@ -25,11 +25,17 @@ in
     withPython3 = false;
 
     extraConfig = ''
+      " Move these paths to the end of $PATH to prevent triggering the XCode CLI popup
+      let xcode_paths = ":/usr/bin:/bin:/usr/sbin:/sbin"
+      let $PATH = substitute($PATH, xcode_paths, "", "") . xcode_paths
+
       lua require('impatient')
       lua require('nix_init')
     '';
 
     extraPackages = with pkgs; [
+      gcc
+      gnumake
       nodejs-16_x
       tree-sitter
 
@@ -73,30 +79,7 @@ in
       dracula-nvim
 
       # Syntax
-      (pkgs.vimPlugins.nvim-treesitter.withPlugins (
-        plugins: with plugins; [
-          tree-sitter-bash
-          tree-sitter-comment
-          tree-sitter-css
-          tree-sitter-dockerfile
-          tree-sitter-elixir
-          tree-sitter-erlang
-          tree-sitter-fish
-          tree-sitter-java
-          tree-sitter-javascript
-          tree-sitter-json
-          tree-sitter-make
-          tree-sitter-nix
-          tree-sitter-query
-          tree-sitter-regex
-          tree-sitter-ruby
-          tree-sitter-svelte
-          tree-sitter-toml
-          tree-sitter-typescript
-          tree-sitter-vim
-          tree-sitter-yaml
-        ]
-      ))
+      nvim-treesitter
       playground
       Jenkinsfile-vim-syntax
 

programs/nvim/plugins.nix

@@ -89,6 +89,17 @@
     };
     meta.homepage = "https://github.com/Mofiqul/dracula.nvim";
   };
+  nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
+    pname = "nvim-treesitter";
+    version = "1642974138";
+    src = pkgs.fetchFromGitHub {
+      owner = "nvim-treesitter";
+      repo = "nvim-treesitter";
+      rev = "3f8829cfb8753c0939246602e213791d8ee5ad2c";
+      sha256 = "IJJ4x/zRaCLX9Z2TKmkyySDx8JtQYvJ/ecFXwhBOy9c=";
+    };
+    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter";
+  };
   playground = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "playground";
     version = "1631739633";

programs/nvim/plugins.txt

@@ -6,6 +6,7 @@ svermeulen/vim-yoink
 svermeulen/vim-cutlass
 svermeulen/vim-subversive
 Mofiqul/dracula.nvim
+nvim-treesitter/nvim-treesitter
 nvim-treesitter/playground
 martinda/Jenkinsfile-vim-syntax
 nvim-lua/popup.nvim