fix(lazy-nvim): load plugins without adding to rtp

this means plugins no longer autoload

init.lua

@@ -1,12 +1,14 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath, })
+if vim.g.nix_plugins_path == nil then
+  local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+  if not (vim.uv or vim.loop).fs_stat(lazypath) then
+    vim.fn.system({
+      "git",
+      "clone",
+      "--filter=blob:none",
+      "https://github.com/folke/lazy.nvim.git",
+      "--branch=stable", -- latest stable release
+      lazypath, })
+  end
 end
 vim.opt.rtp:prepend(lazypath)
 

lua/nobody/init.lua

@@ -6,21 +6,11 @@ require("lazy").setup(
     import = "nobody.plugins",
   },
   { -- opts
-    defaults = {
-      pin = vim.g.nix_plugins_path ~= nil,
-    },
     install = {
-      missing = vim.g.nix_plugins_path == nil,
+      missing = vim.g.is_nix == false,
     },
     change_detection = {
-      notify = false,
-    },
-    performance = {
-      rtp = {
-        paths = {
-          vim.g.nix_plugins_path -- Not needed when merging plugins with `symLinkJoin`
-        },
-      },
+      notify = vim.g.is_nix == false,
     },
   }
 )

lua/nobody/plugins/colorscheme.lua

@@ -2,6 +2,7 @@ return {
   {
     "catppuccin/nvim",
     name = "catppuccin",
+    dir = vim.g.nix_plugins_path,
     lazy = false,
     priority = 1000,
     config = function(_, opts)

lua/nobody/plugins/treesitter.lua

@@ -1,7 +1,9 @@
 return {
   {
-    "tree-sitter/tree-sitter",
+    "nvim-treesitter/nvim-treesitter",
+    name = "nvim-treesitter",
     version = false,
+    dir = vim.g.nix_plugins_path,
     event = { "VeryLazy" },
     lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline
     init = function(plugin)

nix/pkgs/neovim/default.nix

@@ -13,6 +13,8 @@
   ...
 }: let
   inherit (lib) fileset;
+  inherit (lib.strings) getName optionalString;
+  inherit (lib.lists) findFirst filter;
 
   config = pkgs.vimUtils.buildVimPlugin {
     inherit version;
@@ -31,7 +33,13 @@
     lazy-nvim
     catppuccin-nvim
     nvim-treesitter
-  ];
+  ] ++ extraPlugins;
+
+  lazyNvim = findFirst (plugin: (getName plugin) == "lazy-nvim") null plugins;
+  filteredPlugins = if lazyNvim == null then
+  plugins
+  else
+    filter (plugin: (getName plugin) != "lazy-nvim") plugins;
 
   extraPackages' =
     [
@@ -41,14 +49,21 @@
   neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
     withPython3 = true;
     withRuby = false;
-    plugins = [
-      (pkgs.symlinkJoin {
-        name = "neovim-plugins";
-        paths = [vimPlugins.nvim-treesitter.withAllGrammars] ++ plugins ++ [config] ++ extraPlugins;
-      })
-    ];
+    plugins = [config];
+    # plugins = [
+    #   (pkgs.symlinkJoin {
+    #     name = "neovim-plugins";
+    #     paths = plugins ++ [config] ++ extraPlugins;
+    #   })
+    # ];
+  };
+
+  plugins' = pkgs.symlinkJoin {
+    name = "neovim-plugins";
+    paths = filteredPlugins;
   };
 
+
   neovim-unwrapped' = neovim-unwrapped.overrideAttrs (_: previousAttrs: {
     treesitter-parsers = {};
     preConfigure =
@@ -71,8 +86,12 @@ in
         + " "
         + ''--suffix PATH : "${lib.makeBinPath extraPackages'}"'';
 
-      luaRcContent = ''
-        vim.g.nix_plugins_path = '${config}'
-        require("nobody")
+      luaRcContent = optionalString (lazyNvim != null) ''
+        vim.opt.rtp:prepend("${lazyNvim}");
+      '' + ''
+        vim.g.is_nix = true
+        vim.g.nix_plugins_path = "${plugins'}"
+
+        require("nobody");
       '';
     })

nix/pkgs/vimPlugins/overrides.nix

@@ -5,8 +5,6 @@
       or []
       ++ [
         ./patches/lazy-nvim/no-helptags.patch
-        ./patches/lazy-nvim/loader__load.patch
-        ./patches/lazy-nvim/loader_get_main.patch
       ];
   });
 

nix/sources/grammars/sources.json

@@ -59,6 +59,21 @@
       "revision": "7b4275d077ae196fc0ce42ab3ad091574e3ec519",
       "url": "https://api.github.com/repos/tree-sitter/tree-sitter-typescript/tarball/v0.21.1",
       "hash": "1w113zbh322i39pr3cym4n4kvs33sg004mpca5mydh1nx19w06x1"
+    },
+    "tree-sitter-vimdoc": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "neovim",
+        "repo": "tree-sitter-vimdoc"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "version": "v2.5.1",
+      "revision": "241b5e2dd7bd8eb7f7ef84f14cbfdd26d474bda3",
+      "url": "https://api.github.com/repos/neovim/tree-sitter-vimdoc/tarball/v2.5.1",
+      "hash": "0br4i6s1f43nm2j61k3i2mfdr02hwnscnwm59lnbj00pdlv69sdv"
     }
   },
   "version": 3