Merge remote-tracking branch 'refs/remotes/origin/main'

home/config/nvim/init.vim

@@ -30,7 +30,6 @@ call plug#begin('~/.vim/plugged')
   Plug 'whatyouhide/vim-gotham'
   Plug 'nanotech/jellybeans.vim'
   Plug 'sickill/vim-monokai'
-  Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
   Plug 'flebel/vim-mypy', { 'for': 'python', 'branch': 'bugfix/fast_parser_is_default_and_only_parser' }
   Plug 'tpope/vim-fugitive'
   Plug 'tpope/vim-rhubarb'
@@ -147,16 +146,6 @@ endfunction
 " TreeSitter
 lua <<EOF
 require'nvim-treesitter.configs'.setup {
-  -- One of "all", "maintained" (parsers with maintainers), or a list of languages
-  ensure_installed = "all",
-
-  -- Install languages synchronously (only applied to `ensure_installed`)
-  sync_install = false,
-  auto_install = true,
-
-  -- List of parsers to ignore installing
-  ignore_install = {},
-
   highlight = {
     -- `false` will disable the whole extension
     enable = true,

hosts/_common/home.nix

@@ -11,6 +11,7 @@
       exa
       fzf
       ripgrep
+      tree-sitter
       wget
     ];
 

hosts/_common/programs.nix

@@ -23,9 +23,10 @@
 
     programs.neovim = {
       enable = true;
-    };
-    programs.fish = {
-     enable = true;
+      plugins = with pkgs.vimPlugins; [
+        # Inject tree-sitters, since they're annoying to maintain with sideloading
+        (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))
+      ];
     };
 
 

rebuild-ubuntu.sh

@@ -2,5 +2,5 @@
 
 NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/tyrel/channels/nixpkgs:/nix/var/nix/profiles/per-user/tyrel/channels
 
-#nix run ./_ubuntu switch -vv
+nix run ./_ubuntu switch -vv
 home-manager switch --flake ./_ubuntu