fix astronvim

modules/home/shell/neovim.nix

@@ -13,11 +13,32 @@ in {
   config = lib.mkIf cfg.enable {
     programs.neovim = {
       enable = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      withNodeJs = true;
       defaultEditor = true;
       plugins = with pkgs.vimPlugins; [
         lazy-nvim
       ];
+
       extraLuaConfig = ''
+        -- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
+        -- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
+        local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
+        if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
+          -- stylua: ignore
+          vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+        end
+        vim.opt.rtp:prepend(lazypath)
+
+        -- validate that lazy is available
+        if not pcall(require, "lazy") then
+          -- stylua: ignore
+          vim.api.nvim_echo({ { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {})
+          vim.fn.getchar()
+          vim.cmd.quit()
+        end
+
         require "lazy_setup"
       '';
       extraPackages = with pkgs; [
@@ -32,6 +53,10 @@ in {
       ];
     };
 
-    home.file.".config/nvim/lua".source = ./nvim-lua;
+    # home.file.".config/nvim/lua".source = ./nvim-lua;
+    xdg.configFile."nvim/lua" = {
+      recursive = true;
+      source = ./nvim-lua;
+    };
   };
 }

modules/home/shell/nvim-lua/community.lua

@@ -1,24 +1,22 @@
 return {
-  "AstroNvim/astrocommunity",
-  { import = "astrocommunity.pack.bash" },
-  { import = "astrocommunity.pack.cmake" },
-  { import = "astrocommunity.pack.cpp" },
-  { import = "astrocommunity.pack.docker" },
-  { import = "astrocommunity.pack.html-css" },
-  { import = "astrocommunity.pack.json" },
-  { import = "astrocommunity.pack.lua" },
-  { import = "astrocommunity.pack.markdown" },
-  { import = "astrocommunity.pack.nix" },
-  { import = "astrocommunity.pack.python" },
-  { import = "astrocommunity.pack.rust" },
-  { import = "astrocommunity.pack.toml" },
-  { import = "astrocommunity.pack.yaml" },
-  { import = "astrocommunity.git.git-blame-nvim" },
-  { import = "astrocommunity.markdown-and-latex.vimtex" },
-  { import = "astrocommunity.lsp.lsp-inlayhints-nvim" },
-  { import = "astrocommunity.lsp.lsp-lens-nvim" },
-  { import = "astrocommunity.lsp.lsp-signature-nvim" },
-  { import = "astrocommunity.lsp.nvim-lsp-file-operations" },
-  { import = "astrocommunity.bars-and-lines.vim-illuminate" },
+	"AstroNvim/astrocommunity",
+	{ import = "astrocommunity.pack.bash" },
+	{ import = "astrocommunity.pack.cmake" },
+	{ import = "astrocommunity.pack.cpp" },
+	{ import = "astrocommunity.pack.docker" },
+	{ import = "astrocommunity.pack.html-css" },
+	{ import = "astrocommunity.pack.json" },
+	{ import = "astrocommunity.pack.lua" },
+	{ import = "astrocommunity.pack.markdown" },
+	{ import = "astrocommunity.pack.nix" },
+	{ import = "astrocommunity.pack.python" },
+	{ import = "astrocommunity.pack.rust" },
+	{ import = "astrocommunity.pack.toml" },
+	{ import = "astrocommunity.pack.yaml" },
+	{ import = "astrocommunity.git.git-blame-nvim" },
+	{ import = "astrocommunity.markdown-and-latex.vimtex" },
+	{ import = "astrocommunity.lsp.lsp-lens-nvim" },
+	{ import = "astrocommunity.lsp.lsp-signature-nvim" },
+	{ import = "astrocommunity.lsp.nvim-lsp-file-operations" },
+	{ import = "astrocommunity.bars-and-lines.vim-illuminate" },
 }
-

modules/home/shell/nvim-lua/plugins/user.lua

@@ -1,3 +1,4 @@
+---@type LazySpec
 return {
   {
     "p00f/clangd_extensions.nvim",
@@ -26,4 +27,3 @@ return {
     opts = { tools = { inlay_hints = { auto = true } } },
   },
 }
-