Skip to content

Commit 6ff8d99

Browse files
authored
Add astronvim plugins (#368283)
2 parents 04654c4 + 41f9fd5 commit 6ff8d99

File tree

3 files changed

+94
-2
lines changed

3 files changed

+94
-2
lines changed

pkgs/applications/editors/vim/plugins/generated.nix

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,30 @@ final: prev:
749749
meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/";
750750
};
751751

752+
astrocore = buildVimPlugin {
753+
pname = "astrocore";
754+
version = "2024-12-23";
755+
src = fetchFromGitHub {
756+
owner = "AstroNvim";
757+
repo = "astrocore";
758+
rev = "ecaf7c76484d3313b966856c2c29672a6abbc3f4";
759+
sha256 = "1n9akfpm7lmby20w2dmh99vspff8hack81f6d0as531yjjflbcy0";
760+
};
761+
meta.homepage = "https://github.com/AstroNvim/astrocore/";
762+
};
763+
764+
astrolsp = buildVimPlugin {
765+
pname = "astrolsp";
766+
version = "2024-12-23";
767+
src = fetchFromGitHub {
768+
owner = "AstroNvim";
769+
repo = "astrolsp";
770+
rev = "e5e88e2b5ed1c0f8b6fbea682577473aeabdc2b4";
771+
sha256 = "0arf7lmmcniq1ppsa9544x240simw38m72fm4i0100r05p0h4ygk";
772+
};
773+
meta.homepage = "https://github.com/AstroNvim/astrolsp/";
774+
};
775+
752776
astrotheme = buildVimPlugin {
753777
pname = "astrotheme";
754778
version = "2024-12-10";
@@ -761,6 +785,18 @@ final: prev:
761785
meta.homepage = "https://github.com/AstroNvim/astrotheme/";
762786
};
763787

788+
astroui = buildVimPlugin {
789+
pname = "astroui";
790+
version = "2024-12-23";
791+
src = fetchFromGitHub {
792+
owner = "AstroNvim";
793+
repo = "astroui";
794+
rev = "81ddd0315ac4b260a4563a00be943992901ae5e5";
795+
sha256 = "1qv9ny98wxyjdyzsw5gmn4wfsklrl01m27hxaba0mypirjr0kv1r";
796+
};
797+
meta.homepage = "https://github.com/AstroNvim/astroui/";
798+
};
799+
764800
async-vim = buildVimPlugin {
765801
pname = "async.vim";
766802
version = "2022-04-04";
@@ -6507,6 +6543,18 @@ final: prev:
65076543
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
65086544
};
65096545

6546+
mason-null-ls-nvim = buildVimPlugin {
6547+
pname = "mason-null-ls.nvim";
6548+
version = "2024-04-09";
6549+
src = fetchFromGitHub {
6550+
owner = "jay-babu";
6551+
repo = "mason-null-ls.nvim";
6552+
rev = "de19726de7260c68d94691afb057fa73d3cc53e7";
6553+
sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys";
6554+
};
6555+
meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/";
6556+
};
6557+
65106558
mason-nvim = buildVimPlugin {
65116559
pname = "mason.nvim";
65126560
version = "2024-07-16";
@@ -6519,6 +6567,18 @@ final: prev:
65196567
meta.homepage = "https://github.com/williamboman/mason.nvim/";
65206568
};
65216569

6570+
mason-nvim-dap-nvim = buildVimPlugin {
6571+
pname = "mason-nvim-dap.nvim";
6572+
version = "2024-08-04";
6573+
src = fetchFromGitHub {
6574+
owner = "jay-babu";
6575+
repo = "mason-nvim-dap.nvim";
6576+
rev = "8b9363d83b5d779813cdd2819b8308651cec2a09";
6577+
sha256 = "0q2pk217lrnpyvqj0mqikayyiajdvj3apki66mxx27zibgc7qg3l";
6578+
};
6579+
meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
6580+
};
6581+
65226582
mason-tool-installer-nvim = buildVimPlugin {
65236583
pname = "mason-tool-installer.nvim";
65246584
version = "2024-06-03";

pkgs/applications/editors/vim/plugins/overrides.nix

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,23 @@ in
143143
nvimRequireCheck = "advanced_git_search.utils";
144144
};
145145

146+
astrocore = super.astrocore.overrideAttrs {
147+
dependencies = [ self.lazy-nvim ];
148+
};
149+
146150
astrotheme = super.astrotheme.overrideAttrs {
147-
nvimRequireCheck = "astrotheme";
151+
nvimSkipModule = [
152+
# attempt to index local 'c' (a nil value)
153+
"astrotheme.groups.plugins.flash"
154+
"astrotheme.groups.plugins.todo-comments"
155+
];
148156
};
149157

158+
astroui = super.astroui.overrideAttrs (oa: {
159+
# Readme states that astrocore is an optional dependency
160+
nativeCheckInputs = oa.nativeCheckInputs ++ [ self.astrocore ];
161+
});
162+
150163
asyncrun-vim = super.asyncrun-vim.overrideAttrs {
151164
nvimSkipModule = [
152165
# vim plugin with optional toggleterm integration
@@ -1556,6 +1569,20 @@ in
15561569
nvimRequireCheck = "mason-lspconfig";
15571570
};
15581571

1572+
mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
1573+
dependencies = with self; [
1574+
mason-nvim
1575+
null-ls-nvim
1576+
];
1577+
};
1578+
1579+
mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs {
1580+
dependencies = with self; [
1581+
mason-nvim
1582+
nvim-dap
1583+
];
1584+
};
1585+
15591586
mason-nvim = super.mason-nvim.overrideAttrs {
15601587
# lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&'
15611588
nvimSkipModule = "mason-vendor.zzlib.inflate-bwo";
@@ -2345,7 +2372,7 @@ in
23452372
openscad
23462373
];
23472374

2348-
# FIXME: cant find plugin root dir
2375+
# FIXME: can't find plugin root dir
23492376
nvimSkipModule = [
23502377
"openscad"
23512378
"openscad.snippets.openscad"

pkgs/applications/editors/vim/plugins/vim-plugin-names

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ https://github.com/ckarnell/antonys-macro-repeater/,,
6161
https://github.com/solarnz/arcanist.vim/,,
6262
https://github.com/vim-scripts/argtextobj.vim/,,
6363
https://github.com/otavioschwanck/arrow.nvim/,,
64+
https://github.com/AstroNvim/astrocore/,HEAD,
65+
https://github.com/AstroNvim/astrolsp/,HEAD,
6466
https://github.com/AstroNvim/astrotheme/,,
67+
https://github.com/AstroNvim/astroui/,HEAD,
6568
https://github.com/prabirshrestha/async.vim/,,
6669
https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
6770
https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
@@ -539,6 +542,8 @@ https://github.com/David-Kunz/markid/,HEAD,
539542
https://github.com/chentoast/marks.nvim/,,
540543
https://github.com/OXY2DEV/markview.nvim/,HEAD,
541544
https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
545+
https://github.com/jay-babu/mason-null-ls.nvim/,HEAD,
546+
https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD,
542547
https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
543548
https://github.com/williamboman/mason.nvim/,HEAD,
544549
https://github.com/vim-scripts/matchit.zip/,,

0 commit comments

Comments
 (0)