mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 16:39:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

misc: update inputs + make use of upstream plugins (#294)

Browse source
This commit is contained in:
Gaétan Lepage 2023-03-26 15:44:45 +02:00 • committed by GitHub
parent 7f50b54bfb
commit e46b7302af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 45 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

164
plugins/_sources/generated.json
View file

@ -1,27 +1,7 @@
{
"coq-artifacts": {
"cargoLocks": null,
"date": "2023-03-12",
"extract": null,
"name": "coq-artifacts",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "ms-jpq",
"repo": "coq.artifacts",
"rev": "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90",
"sha256": "sha256-e+w5tLuer/4f0oImlIgxmI4Ke9h6x0PQ8+nVJDihkGQ=",
"type": "github"
},
"version": "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90"
},
"coq-nvim": {
"cargoLocks": null,
"date": "2023-03-12",
"date": "2023-03-26",
"extract": null,
"name": "coq-nvim",
"passthru": null,
@ -33,135 +13,15 @@
"name": null,
"owner": "ms-jpq",
"repo": "coq_nvim",
"rev": "4b4b93dbbfc871a3d32a244a4276ee06696c21bb",
"sha256": "sha256-OXhLs7fO+qlOPyDc8AOA+bkbj9OzMZO8CFgfE/Q1cro=",
"rev": "8847707462e5d89a0043e7846439e180b9dfb04f",
"sha256": "sha256-AynBc+TnBBFu+h/ejimgIF+7XyKatv1W81/frzZ4Dto=",
"type": "github"
},
"version": "4b4b93dbbfc871a3d32a244a4276ee06696c21bb"
},
"inc-rename": {
"cargoLocks": null,
"date": "2023-01-29",
"extract": null,
"name": "inc-rename",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "smjonas",
"repo": "inc-rename.nvim",
"rev": "21c23c379342a731a0c90f226601ec0434627b26",
"sha256": "sha256-KxXVe0amA0tyU6J2M+4XERSyERWS4BqGuxmbJ9YUyRs=",
"type": "github"
},
"version": "21c23c379342a731a0c90f226601ec0434627b26"
},
"intellitab-nvim": {
"cargoLocks": null,
"date": "2021-11-13",
"extract": null,
"name": "intellitab-nvim",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "pta2002",
"repo": "intellitab.nvim",
"rev": "a6c1a505865f6131866d609c52440306e9914b16",
"sha256": "sha256-z5G7v2OttQs5B/uqWdxYtW6wPnVPARjQYidKLYkhvqY=",
"type": "github"
},
"version": "a6c1a505865f6131866d609c52440306e9914b16"
},
"magma-nvim": {
"cargoLocks": null,
"date": "2023-03-13",
"extract": null,
"name": "magma-nvim",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "WhiteBlackGoose",
"repo": "magma-nvim-goose",
"rev": "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f",
"sha256": "sha256-Sq7J43AYvsfUdFXELzEwBNTpnOt/F43/de+2zwBspoE=",
"type": "github"
},
"version": "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f"
},
"mark-radar": {
"cargoLocks": null,
"date": "2021-06-22",
"extract": null,
"name": "mark-radar",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "winston0410",
"repo": "mark-radar.nvim",
"rev": "d7fb84a670795a5b36b18a5b59afd1d3865cbec7",
"sha256": "sha256-6WfEFLFQnDpQ2X0NRSa25ALvm/SxiFoW4PAzBA8TdPg=",
"type": "github"
},
"version": "d7fb84a670795a5b36b18a5b59afd1d3865cbec7"
},
"netman-nvim": {
"cargoLocks": null,
"date": "2023-03-02",
"extract": null,
"name": "netman-nvim",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "miversen33",
"repo": "netman.nvim",
"rev": "1ef50efcbe88f8293e97946af37243a20873bb1c",
"sha256": "sha256-oRjBjVmO/7bmgyf9ltthRrwZBD5SLD757GklSjw1bJs=",
"type": "github"
},
"version": "1ef50efcbe88f8293e97946af37243a20873bb1c"
},
"nvim-osc52": {
"cargoLocks": null,
"date": "2023-03-03",
"extract": null,
"name": "nvim-osc52",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "ojroques",
"repo": "nvim-osc52",
"rev": "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31",
"sha256": "sha256-SQpwiA+dyTRXBq0YtUZ4nkYKglyChIyQeWopD73qznQ=",
"type": "github"
},
"version": "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31"
"version": "8847707462e5d89a0043e7846439e180b9dfb04f"
},
"pynvim_pp": {
"cargoLocks": null,
"date": "2023-03-12",
"date": "2023-03-26",
"extract": null,
"name": "pynvim_pp",
"passthru": null,
@ -173,15 +33,15 @@
"name": null,
"owner": "ms-jpq",
"repo": "pynvim_pp",
"rev": "40db0426f171d413dcc976b17c8eff0127664f23",
"sha256": "sha256-AtsoRJQcO5jDNlSydVnqcN7f4xURmH6bGFPpjsZ9Yrg=",
"rev": "28b86c08b5906401fe661b3cb01f212d4229d146",
"sha256": "sha256-DEA+LdWNLzOTAwHSFc44ozlK2kqk+XV2GKyBAqifUJY=",
"type": "github"
},
"version": "40db0426f171d413dcc976b17c8eff0127664f23"
"version": "28b86c08b5906401fe661b3cb01f212d4229d146"
},
"std2": {
"cargoLocks": null,
"date": "2023-03-12",
"date": "2023-03-26",
"extract": null,
"name": "std2",
"passthru": null,
@ -193,10 +53,10 @@
"name": null,
"owner": "ms-jpq",
"repo": "std2",
"rev": "43635e036486296776b4ef5ac498f742ad25a691",
"sha256": "sha256-oWVaw7v1Sl7DkqIJOm8wEReID9MTD3XFOdpyQDXRa04=",
"rev": "360d30e19f17e38dba8cf05c9d41d0901a168d83",
"sha256": "sha256-3ugG2OieAVOxUylFLAb5EvZNkeEZb3DHYhGgqlMn8qg=",
"type": "github"
},
"version": "43635e036486296776b4ef5ac498f742ad25a691"
"version": "360d30e19f17e38dba8cf05c9d41d0901a168d83"
}
}

108
plugins/_sources/generated.nix
View file

@ -1,124 +1,40 @@
# This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{
coq-artifacts = {
pname = "coq-artifacts";
version = "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90";
src = fetchFromGitHub ({
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90";
fetchSubmodules = false;
sha256 = "sha256-e+w5tLuer/4f0oImlIgxmI4Ke9h6x0PQ8+nVJDihkGQ=";
});
date = "2023-03-12";
};
coq-nvim = {
pname = "coq-nvim";
version = "4b4b93dbbfc871a3d32a244a4276ee06696c21bb";
version = "8847707462e5d89a0043e7846439e180b9dfb04f";
src = fetchFromGitHub ({
owner = "ms-jpq";
repo = "coq_nvim";
rev = "4b4b93dbbfc871a3d32a244a4276ee06696c21bb";
rev = "8847707462e5d89a0043e7846439e180b9dfb04f";
fetchSubmodules = false;
sha256 = "sha256-OXhLs7fO+qlOPyDc8AOA+bkbj9OzMZO8CFgfE/Q1cro=";
sha256 = "sha256-AynBc+TnBBFu+h/ejimgIF+7XyKatv1W81/frzZ4Dto=";
});
date = "2023-03-12";
};
inc-rename = {
pname = "inc-rename";
version = "21c23c379342a731a0c90f226601ec0434627b26";
src = fetchFromGitHub ({
owner = "smjonas";
repo = "inc-rename.nvim";
rev = "21c23c379342a731a0c90f226601ec0434627b26";
fetchSubmodules = false;
sha256 = "sha256-KxXVe0amA0tyU6J2M+4XERSyERWS4BqGuxmbJ9YUyRs=";
});
date = "2023-01-29";
};
intellitab-nvim = {
pname = "intellitab-nvim";
version = "a6c1a505865f6131866d609c52440306e9914b16";
src = fetchFromGitHub ({
owner = "pta2002";
repo = "intellitab.nvim";
rev = "a6c1a505865f6131866d609c52440306e9914b16";
fetchSubmodules = false;
sha256 = "sha256-z5G7v2OttQs5B/uqWdxYtW6wPnVPARjQYidKLYkhvqY=";
});
date = "2021-11-13";
};
magma-nvim = {
pname = "magma-nvim";
version = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f";
src = fetchFromGitHub ({
owner = "WhiteBlackGoose";
repo = "magma-nvim-goose";
rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f";
fetchSubmodules = false;
sha256 = "sha256-Sq7J43AYvsfUdFXELzEwBNTpnOt/F43/de+2zwBspoE=";
});
date = "2023-03-13";
};
mark-radar = {
pname = "mark-radar";
version = "d7fb84a670795a5b36b18a5b59afd1d3865cbec7";
src = fetchFromGitHub ({
owner = "winston0410";
repo = "mark-radar.nvim";
rev = "d7fb84a670795a5b36b18a5b59afd1d3865cbec7";
fetchSubmodules = false;
sha256 = "sha256-6WfEFLFQnDpQ2X0NRSa25ALvm/SxiFoW4PAzBA8TdPg=";
});
date = "2021-06-22";
};
netman-nvim = {
pname = "netman-nvim";
version = "1ef50efcbe88f8293e97946af37243a20873bb1c";
src = fetchFromGitHub ({
owner = "miversen33";
repo = "netman.nvim";
rev = "1ef50efcbe88f8293e97946af37243a20873bb1c";
fetchSubmodules = false;
sha256 = "sha256-oRjBjVmO/7bmgyf9ltthRrwZBD5SLD757GklSjw1bJs=";
});
date = "2023-03-02";
};
nvim-osc52 = {
pname = "nvim-osc52";
version = "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31";
src = fetchFromGitHub ({
owner = "ojroques";
repo = "nvim-osc52";
rev = "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31";
fetchSubmodules = false;
sha256 = "sha256-SQpwiA+dyTRXBq0YtUZ4nkYKglyChIyQeWopD73qznQ=";
});
date = "2023-03-03";
date = "2023-03-26";
};
pynvim_pp = {
pname = "pynvim_pp";
version = "40db0426f171d413dcc976b17c8eff0127664f23";
version = "28b86c08b5906401fe661b3cb01f212d4229d146";
src = fetchFromGitHub ({
owner = "ms-jpq";
repo = "pynvim_pp";
rev = "40db0426f171d413dcc976b17c8eff0127664f23";
rev = "28b86c08b5906401fe661b3cb01f212d4229d146";
fetchSubmodules = false;
sha256 = "sha256-AtsoRJQcO5jDNlSydVnqcN7f4xURmH6bGFPpjsZ9Yrg=";
sha256 = "sha256-DEA+LdWNLzOTAwHSFc44ozlK2kqk+XV2GKyBAqifUJY=";
});
date = "2023-03-12";
date = "2023-03-26";
};
std2 = {
pname = "std2";
version = "43635e036486296776b4ef5ac498f742ad25a691";
version = "360d30e19f17e38dba8cf05c9d41d0901a168d83";
src = fetchFromGitHub ({
owner = "ms-jpq";
repo = "std2";
rev = "43635e036486296776b4ef5ac498f742ad25a691";
rev = "360d30e19f17e38dba8cf05c9d41d0901a168d83";
fetchSubmodules = false;
sha256 = "sha256-oWVaw7v1Sl7DkqIJOm8wEReID9MTD3XFOdpyQDXRa04=";
sha256 = "sha256-3ugG2OieAVOxUylFLAb5EvZNkeEZb3DHYhGgqlMn8qg=";
});
date = "2023-03-12";
date = "2023-03-26";
};
}

3
plugins/completion/coq.nix
View file

@ -7,7 +7,6 @@
with lib; let
cfg = config.plugins.coq-nvim;
helpers = import ../helpers.nix {inherit lib;};
plugins = import ../plugin-defs.nix {inherit pkgs;};
in {
options = {
plugins.coq-nvim = {
@ -42,7 +41,7 @@ in {
[
cfg.package
]
++ optional cfg.installArtifacts plugins.coq-artifacts;
++ optional cfg.installArtifacts pkgs.vimPlugins.coq-artifacts;
plugins.lsp = {
preConfig = ''
vim.g.coq_settings = ${helpers.toLuaObject settings}

28
plugins/nvfetcher.toml
View file

@ -1,11 +1,3 @@
[intellitab-nvim]
src.git = "https://github.com/pta2002/intellitab.nvim"
fetch.github = "pta2002/intellitab.nvim"
[mark-radar]
src.git = "https://github.com/winston0410/mark-radar.nvim"
fetch.github = "winston0410/mark-radar.nvim"
[coq-nvim]
src.git = "https://github.com/ms-jpq/coq_nvim"
fetch.github = "ms-jpq/coq_nvim"
@ -17,23 +9,3 @@ fetch.github = "ms-jpq/std2"
[pynvim_pp]
src.git = "https://github.com/ms-jpq/pynvim_pp"
fetch.github = "ms-jpq/pynvim_pp"
[coq-artifacts]
src.git = "https://github.com/ms-jpq/coq.artifacts"
fetch.github = "ms-jpq/coq.artifacts"
[magma-nvim]
src.git = "https://github.com/WhiteBlackGoose/magma-nvim-goose"
fetch.github = "WhiteBlackGoose/magma-nvim-goose"
[nvim-osc52]
src.git = "https://github.com/ojroques/nvim-osc52"
fetch.github = "ojroques/nvim-osc52"
[netman-nvim]
src.git = "https://github.com/miversen33/netman.nvim"
fetch.github = "miversen33/netman.nvim"
[inc-rename]
src.git = "https://github.com/smjonas/inc-rename.nvim"
fetch.github = "smjonas/inc-rename.nvim"

3
plugins/nvim-lsp/inc-rename.nix
View file

@ -6,12 +6,11 @@
} @ args:
with lib; let
helpers = import ../helpers.nix args;
plugin-defs = import ../plugin-defs.nix {inherit pkgs;};
in {
options.plugins.inc-rename = {
enable = mkEnableOption "inc-rename, a plugin previewing LSP renaming";
package = helpers.mkPackageOption "inc-rename" plugin-defs.inc-rename;
package = helpers.mkPackageOption "inc-rename" pkgs.vimPlugins.inc-rename-nvim;
cmdName = helpers.defaultNullOpts.mkStr "IncRename" "the name of the command";

51
plugins/plugin-defs.nix
View file

@ -6,12 +6,6 @@
{pkgs, ...}: let
sources = pkgs.callPackage ./_sources/generated.nix {};
in {
intellitab-nvim = pkgs.vimUtils.buildVimPlugin {
inherit (sources.intellitab-nvim) pname version src;
};
mark-radar = pkgs.vimUtils.buildVimPlugin {
inherit (sources.mark-radar) pname version src;
};
coq-nvim = pkgs.vimUtils.buildVimPlugin {
inherit (sources.coq-nvim) pname version src;
@ -37,49 +31,4 @@ in {
--replace "_IN_VENV = _RT_PY == _EXEC_PATH" "_IN_VENV = True"
'';
};
coq-artifacts = pkgs.vimUtils.buildVimPlugin {
inherit (sources.coq-artifacts) pname version src;
};
magma-nvim = pkgs.vimUtils.buildVimPlugin {
inherit (sources.magma-nvim) pname version src;
passthru.python3Dependencies = ps:
with ps; [
pynvim
jupyter-client
ueberzug
pillow
cairosvg
plotly
ipykernel
pyperclip
(ps.buildPythonPackage rec {
pname = "pnglatex";
version = "1.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-CZUGDUkmttO0BzFYbGFSNMPkWzFC/BW4NmAeOwz4Y9M=";
};
doCheck = false;
meta = {
homepage = "https://github.com/MaT1g3R/pnglatex";
description = "a small program that converts LaTeX snippets to png";
};
})
];
};
nvim-osc52 = pkgs.vimUtils.buildVimPlugin {
inherit (sources.nvim-osc52) pname version src;
};
netman-nvim = pkgs.vimUtils.buildVimPlugin {
inherit (sources.netman-nvim) pname version src;
};
inc-rename = pkgs.vimUtils.buildVimPlugin {
inherit (sources.inc-rename) pname version src;
};
}

3
plugins/utils/intellitab.nix
View file

@ -7,13 +7,12 @@
with lib; let
cfg = config.plugins.intellitab;
helpers = import ../helpers.nix {inherit lib;};
defs = import ../plugin-defs.nix {inherit pkgs;};
in {
options = {
plugins.intellitab = {
enable = mkEnableOption "intellitab.nvim";
package = helpers.mkPackageOption "intellitab.nvim" defs.intellitab-nvim;
package = helpers.mkPackageOption "intellitab.nvim" pkgs.vimPlugins.intellitab-nvim;
};
};

3
plugins/utils/magma-nvim.nix
View file

@ -5,7 +5,6 @@
} @ args:
with lib;
with import ../helpers.nix {inherit lib;}; let
plugins = import ../plugin-defs.nix {inherit pkgs;};
optionWarnings = import ../../lib/option-warnings.nix args;
basePluginPath = ["plugins" "magma-nvim"];
in
@ -55,7 +54,7 @@ in
// mkPlugin args {
name = "magma-nvim";
description = "magma-nvim";
package = plugins.magma-nvim;
package = pkgs.vimPlugins.magma-nvim-goose;
globalPrefix = "magma_";
options = {

3
plugins/utils/mark-radar.nix
View file

@ -7,7 +7,6 @@
with lib; let
cfg = config.plugins.mark-radar;
helpers = import ../helpers.nix {inherit lib;};
defs = import ../plugin-defs.nix {inherit pkgs;};
optionWarnings = import ../../lib/option-warnings.nix args;
basePluginPath = ["plugins" "mark-radar"];
in {
@ -36,7 +35,7 @@ in {
// {
enable = mkEnableOption "mark-radar";
package = helpers.mkPackageOption "mark-radar" defs.mark-radar;
package = helpers.mkPackageOption "mark-radar" pkgs.vimPlugins.mark-radar-nvim;
setDefaultMappings =
helpers.defaultNullOpts.mkBool true

4
plugins/utils/netman.nix
View file

@ -4,13 +4,13 @@
pkgs,
...
} @ args: let
defs = import ../plugin-defs.nix {inherit pkgs;};
helpers = import ../helpers.nix args;
in
with lib; {
options.plugins.netman = {
enable = mkEnableOption "netman.nvim, a framework to access remote resources";
package = helpers.mkPackageOption "netman.nvim" defs.netman-nvim;
package = helpers.mkPackageOption "netman.nvim" pkgs.vimPlugins.netman-nvim;
neoTreeIntegration = mkEnableOption "support for netman as a neo-tree source";
};

4
plugins/utils/nvim-osc52.nix
View file

@ -4,13 +4,13 @@
config,
...
} @ args: let
plugin-defs = import ../plugin-defs.nix {inherit pkgs;};
helpers = import ../helpers.nix args;
in
with lib; {
options.plugins.nvim-osc52 = {
enable = mkEnableOption "nvim-osc52, a plugin to use OSC52 sequences to copy/paste";
package = helpers.mkPackageOption "nvim-osc52" plugin-defs.nvim-osc52;
package = helpers.mkPackageOption "nvim-osc52" pkgs.vimPlugins.nvim-osc52;
maxLength =
helpers.defaultNullOpts.mkInt 0 "Maximum length of selection (0 for no limit)";