diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0ef72ff3e9c48..cf293c6570022 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -749,6 +749,30 @@ final: prev:
     meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/";
   };
 
+  astrocore = buildVimPlugin {
+    pname = "astrocore";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astrocore";
+      rev = "ecaf7c76484d3313b966856c2c29672a6abbc3f4";
+      sha256 = "1n9akfpm7lmby20w2dmh99vspff8hack81f6d0as531yjjflbcy0";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astrocore/";
+  };
+
+  astrolsp = buildVimPlugin {
+    pname = "astrolsp";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astrolsp";
+      rev = "e5e88e2b5ed1c0f8b6fbea682577473aeabdc2b4";
+      sha256 = "0arf7lmmcniq1ppsa9544x240simw38m72fm4i0100r05p0h4ygk";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astrolsp/";
+  };
+
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
     version = "2024-12-10";
@@ -761,6 +785,18 @@ final: prev:
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
   };
 
+  astroui = buildVimPlugin {
+    pname = "astroui";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astroui";
+      rev = "81ddd0315ac4b260a4563a00be943992901ae5e5";
+      sha256 = "1qv9ny98wxyjdyzsw5gmn4wfsklrl01m27hxaba0mypirjr0kv1r";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astroui/";
+  };
+
   async-vim = buildVimPlugin {
     pname = "async.vim";
     version = "2022-04-04";
@@ -6507,6 +6543,18 @@ final: prev:
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
 
+  mason-null-ls-nvim = buildVimPlugin {
+    pname = "mason-null-ls.nvim";
+    version = "2024-04-09";
+    src = fetchFromGitHub {
+      owner = "jay-babu";
+      repo = "mason-null-ls.nvim";
+      rev = "de19726de7260c68d94691afb057fa73d3cc53e7";
+      sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys";
+    };
+    meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/";
+  };
+
   mason-nvim = buildVimPlugin {
     pname = "mason.nvim";
     version = "2024-07-16";
@@ -6519,6 +6567,18 @@ final: prev:
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
 
+  mason-nvim-dap-nvim = buildVimPlugin {
+    pname = "mason-nvim-dap.nvim";
+    version = "2024-08-04";
+    src = fetchFromGitHub {
+      owner = "jay-babu";
+      repo = "mason-nvim-dap.nvim";
+      rev = "8b9363d83b5d779813cdd2819b8308651cec2a09";
+      sha256 = "0q2pk217lrnpyvqj0mqikayyiajdvj3apki66mxx27zibgc7qg3l";
+    };
+    meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
+  };
+
   mason-tool-installer-nvim = buildVimPlugin {
     pname = "mason-tool-installer.nvim";
     version = "2024-06-03";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index ef0550d089de6..8b658ea75c478 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -143,10 +143,23 @@ in
     nvimRequireCheck = "advanced_git_search.utils";
   };
 
+  astrocore = super.astrocore.overrideAttrs {
+    dependencies = [ self.lazy-nvim ];
+  };
+
   astrotheme = super.astrotheme.overrideAttrs {
-    nvimRequireCheck = "astrotheme";
+    nvimSkipModule = [
+      # attempt to index local 'c' (a nil value)
+      "astrotheme.groups.plugins.flash"
+      "astrotheme.groups.plugins.todo-comments"
+    ];
   };
 
+  astroui = super.astroui.overrideAttrs (oa: {
+    # Readme states that astrocore is an optional dependency
+    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.astrocore ];
+  });
+
   asyncrun-vim = super.asyncrun-vim.overrideAttrs {
     nvimSkipModule = [
       # vim plugin with optional toggleterm integration
@@ -1556,6 +1569,20 @@ in
     nvimRequireCheck = "mason-lspconfig";
   };
 
+  mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
+    dependencies = with self; [
+      mason-nvim
+      null-ls-nvim
+    ];
+  };
+
+  mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs {
+    dependencies = with self; [
+      mason-nvim
+      nvim-dap
+    ];
+  };
+
   mason-nvim = super.mason-nvim.overrideAttrs {
     # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&'
     nvimSkipModule = "mason-vendor.zzlib.inflate-bwo";
@@ -2345,7 +2372,7 @@ in
       openscad
     ];
 
-    # FIXME: cant find plugin root dir
+    # FIXME: can't find plugin root dir
     nvimSkipModule = [
       "openscad"
       "openscad.snippets.openscad"
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 86c4d7989bdbe..06a8a887d4d20 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -61,7 +61,10 @@ https://github.com/ckarnell/antonys-macro-repeater/,,
 https://github.com/solarnz/arcanist.vim/,,
 https://github.com/vim-scripts/argtextobj.vim/,,
 https://github.com/otavioschwanck/arrow.nvim/,,
+https://github.com/AstroNvim/astrocore/,HEAD,
+https://github.com/AstroNvim/astrolsp/,HEAD,
 https://github.com/AstroNvim/astrotheme/,,
+https://github.com/AstroNvim/astroui/,HEAD,
 https://github.com/prabirshrestha/async.vim/,,
 https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
 https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
@@ -539,6 +542,8 @@ https://github.com/David-Kunz/markid/,HEAD,
 https://github.com/chentoast/marks.nvim/,,
 https://github.com/OXY2DEV/markview.nvim/,HEAD,
 https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
+https://github.com/jay-babu/mason-null-ls.nvim/,HEAD,
+https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD,
 https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
 https://github.com/williamboman/mason.nvim/,HEAD,
 https://github.com/vim-scripts/matchit.zip/,,