From 79795a57979b7bf213e624f6661855fa651cf1a6 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:32 +0100 Subject: [PATCH 1/5] vimPlugins.astrocore: init at 2024-12-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 6 +++++- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0ef72ff3e9c4..7c57c724ef7d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -749,6 +749,18 @@ 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/"; + }; + astrotheme = buildVimPlugin { pname = "astrotheme"; version = "2024-12-10"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ef0550d089de..71f59ea3c5bc 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -143,6 +143,10 @@ in nvimRequireCheck = "advanced_git_search.utils"; }; + astrocore = super.astrocore.overrideAttrs { + dependencies = [ self.lazy-nvim ]; + }; + astrotheme = super.astrotheme.overrideAttrs { nvimRequireCheck = "astrotheme"; }; @@ -2345,7 +2349,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 86c4d7989bdb..a8b9ce8003f6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -61,6 +61,7 @@ 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/astrotheme/,, https://github.com/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, From d4797eb1104b3043739619fe68df5ea2c8d42483 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:40 +0100 Subject: [PATCH 2/5] vimPlugins.astrolsp: init at 2024-12-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7c57c724ef7d..78c067c88ce8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -761,6 +761,18 @@ final: prev: 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"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a8b9ce8003f6..a14de70e8ad2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -62,6 +62,7 @@ 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/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, From 173f27f7d9645a4415f686c84b41a7c09e54c6b1 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:47 +0100 Subject: [PATCH 3/5] vimPlugins.astroui: init at 2024-12-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 11 ++++++++++- .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 78c067c88ce8..ec867d55466d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -785,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"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 71f59ea3c5bc..a24abd823128 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -148,9 +148,18 @@ in }; 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 diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a14de70e8ad2..9e7bbcf737bc 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -64,6 +64,7 @@ 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, From 834fa310e1d1378ceb08eca03afd307c9f844792 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:45:54 +0100 Subject: [PATCH 4/5] vimPlugins.mason-null-ls-nvim: init at 2024-04-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 20 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ec867d55466d..6a93b90c1b39 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6543,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"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a24abd823128..e19f2b36d734 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1569,6 +1569,13 @@ in nvimRequireCheck = "mason-lspconfig"; }; + mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs { + dependencies = with self; [ + mason-nvim + null-ls-nvim + ]; + }; + mason-nvim = super.mason-nvim.overrideAttrs { # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&' nvimSkipModule = "mason-vendor.zzlib.inflate-bwo"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9e7bbcf737bc..8dd765b73728 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -542,6 +542,7 @@ 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/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, From 41f9fd5da8b4e6b97c7eb9400acd5aa66a92a63d Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Thu, 26 Dec 2024 10:46:07 +0100 Subject: [PATCH 5/5] vimPlugins.mason-nvim-dap-nvim: init at 2024-08-04 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 20 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6a93b90c1b39..cf293c657002 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6567,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 e19f2b36d734..8b658ea75c47 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1576,6 +1576,13 @@ in ]; }; + 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"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8dd765b73728..06a8a887d4d2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -543,6 +543,7 @@ 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/,,