update + fixes + tresitter plugins

nix/users/base/neovim/default.nix

@@ -23,31 +23,31 @@
 
     defaultEditor = true;
 
-    plugins = with pkgs; [
+    plugins = with pkgs.vimPlugins; [
       # Colorschemes
       {
-        plugin = vimPlugins.catppuccin-nvim;
+        plugin = catppuccin-nvim;
         config = toLuaFile ./plugins/colorschemes/catppuccin.lua;
       }
 
       # LSP
       {
-        plugin = vimPlugins.nvim-lspconfig;
+        plugin = nvim-lspconfig;
         config = toLuaFile ./plugins/lsp.lua;
       }
 
-      vimPlugins.cmp-buffer
-      vimPlugins.cmp-cmdline
-      vimPlugins.cmp-nvim-lsp
-      vimPlugins.cmp-nvim-lua
-      vimPlugins.cmp-path
-      vimPlugins.cmp_luasnip
-      vimPlugins.luasnip
-      vimPlugins.nvim-cmp
+      cmp-buffer
+      cmp-cmdline
+      cmp-nvim-lsp
+      cmp-nvim-lua
+      cmp-path
+      cmp_luasnip
+      luasnip
+      nvim-cmp
 
       # The rest
       {
-        plugin = vimPlugins.indent-blankline-nvim;
+        plugin = indent-blankline-nvim;
         config = toLuaFile ./plugins/indent.lua;
       }
 
@@ -55,22 +55,22 @@
       
       # TODO: enable this when treesitter is installed
       # {
-      #   plugin = vimPlugins.nvim-ts-autotag;
+      #   plugin = nvim-ts-autotag;
       #   config = toLuaFile ./plugins/autotag.lua;
       # }
 
       {
-        plugin = vimPlugins.nvim-colorizer-lua;
+        plugin = nvim-colorizer-lua;
         config = toLuaFile ./plugins/colorizer.lua;
       }
 
       # GIT
       {
-        plugin = vimPlugins.gitsigns-nvim;
+        plugin = gitsigns-nvim;
         config = toLuaFile ./plugins/gitsigns.lua;
       }
 
-      vimPlugins.vim-fugitive
+      vim-fugitive
 
       {
         plugin = (fromGitHub "3af6232c8d39d51062702e875ff6407c1eeb0391" "main" "xiyaowong/transparent.nvim");
@@ -78,28 +78,52 @@
       }
       
       {
-        plugin = vimPlugins.presence-nvim;
+        plugin = presence-nvim;
         config = toLuaFile ./plugins/presence.lua;
       }
 
       {
-        plugin = vimPlugins.comment-nvim;
+        plugin = comment-nvim;
         config = toLuaFile ./plugins/comment.lua;
       }
         
       {
-        plugin = vimPlugins.which-key-nvim;
+        plugin = which-key-nvim;
         config = toLuaFile ./plugins/whichkey.lua;
       }
 
       {
-        plugin = vimPlugins.nvim-autopairs;
-        config = toLuaFile ./plugins/autopairs.lua
+        plugin = nvim-autopairs;
+        config = toLuaFile ./plugins/autopairs.lua;
       }
 
       {
-        plugin = vimPlugins.nvim-treesitter;
-        config = toLuaFile ./plugins/treesitter.lua
+        plugin = (nvim-treesitter.withPlugins (p: [
+          p.tree-sitter-nix
+          p.tree-sitter-c
+          p.tree-sitter-lua
+          p.tree-sitter-vim
+          p.tree-sitter-python
+          p.tree-sitter-html
+          p.tree-sitter-go
+          p.tree-sitter-javascript
+          p.tree-sitter-toml
+          p.tree-sitter-css
+          p.tree-sitter-gitignore
+          p.tree-sitter-gitcommit
+          p.tree-sitter-git_rebase
+          p.tree-sitter-cpp
+          p.tree-sitter-dockerfile
+          p.tree-sitter-c_sharp
+          p.tree-sitter-jq
+          p.tree-sitter-jsonnet
+          p.tree-sitter-rust
+          p.tree-sitter-ruby
+          p.tree-sitter-solidity
+          p.tree-sitter-sql
+          p.tree-sitter-yaml
+        ]));
+        config = toLuaFile ./plugins/treesitter.lua;
       }
     ];
 

nix/users/base/neovim/plugins/indent.lua

@@ -4,7 +4,7 @@ if not status then
     return
 end
 plugin.setup{
-    show_current_context = true,
-    show_current_context_start = true,
+    -- show_current_context = true,
+    -- show_current_context_start = true,
 }
-vim.g.indent_blankline_filetype_exclude = {'dashboard'}
+-- vim.g.indent_blankline_filetype_exclude = {'dashboard'}

nix/users/base/neovim/plugins/treesitter.lua

@@ -4,59 +4,14 @@ if not status then
    return
 end
 plugin.setup {
-  -- A list of parser names, or "all" (the four listed parsers should always be installed)
-  ensure_installed = { 
-      "c", 
-      "lua", 
-      "vim", 
-      "python", 
-      "html", 
-      "htmldjango",
-      "go",
-      "javascript",
-      "typescript",
-      "toml",
-      "css",
-      "gitignore",
-      "gitcommit",
-      "git_rebase",
-      "gitattributes",
-      "cpp",
-      "dockerfile",
-      "c_sharp",
-      "jq",
-      "jsonnet",
-      "kotlin",
-      "rust",
-      "ruby",
-      "solidity",
-      "sql",
-      "yaml",
-      "nix",
-  },
+  ensure_installed = {},
 
-  -- Install parsers synchronously (only applied to `ensure_installed`)
-  sync_install = false,
-
-  -- Automatically install missing parsers when entering buffer
-  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-  auto_install = true,
-
-  -- List of parsers to ignore installing (for "all")
-  --ignore_install = { "javascript" },
-
-  ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-  -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
+  auto_install = false,
 
   highlight = {
-    -- `false` will disable the whole extension
     enable = true,
     use_languagetree = true,
     disable = {"css", "html" },
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
     additional_vim_regex_highlighting = false,
-
   },
 }