Merge remote-tracking branch 'origin/master' into staging-next (fdc64cfe) · Commits · nix / nixpkgs

doc/languages-frameworks/vim.section.md

+13 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,19 @@ To add a new plugin, run `nix-shell -p vimPluginsUpdater --run 'vim-plugins-upda

		Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `vimPluginsUpdater` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim.

		### Testing Neovim plugins {#testing-neovim-plugins}

		`nvimRequireCheck=MODULE` is a simple test which checks if Neovim can requires the lua module `MODULE` without errors. This is often enough to catch missing dependencies.

		This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).

		```nix
		gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
		dependencies = [ self.plenary-nvim ];
		nvimRequireCheck = "gitsigns";
		};
		```

		### Plugin optional configuration {#vim-plugin-required-snippet}

		Some plugins require specific configuration to work. We choose not to

+14 −1

Original line number	Diff line number	Diff line
		@@ -1817,6 +1817,13 @@
		githubId = 338268;
		name = "Alexei Robyn";
		};
		artem = {
		email = "a@pelenitsyn.top";
		github = "ulysses4ever";
		githubId = 6832600;
		name = "Artem Pelenitsyn";
		matrix = "@artem.types:matrix.org";
		};
		artemist = {
		email = "me@artem.ist";
		github = "artemist";
		@@ -8938,6 +8945,12 @@
		githubId = 6109326;
		name = "David Hummel";
		};
		husjon = {
		name = "Jon Erling Hustadnes";
		email = "jonerling.hustadnes+nixpkgs@gmail.com";
		github = "husjon";
		githubId = 554229;
		};
		husky = {
		email = "husky@husky.sh";
		github = "huskyistaken";
		@@ -18390,7 +18403,7 @@
		};
		rnhmjoj = {
		email = "rnhmjoj@inventati.org";
		matrix = "@rnhmjoj:maxwell.ydns.eu";
		matrix = "@rnhmjoj:eurofusion.eu";
		github = "rnhmjoj";
		githubId = 2817565;
		name = "Michele Guerini Rocco";

+5 −3

Original line number	Diff line number	Diff line
		@@ -78,6 +78,11 @@
		};

		config = lib.mkIf config.hardware.nvidia-container-toolkit.enable {
		assertions = [
		{ assertion = config.hardware.nvidia.datacenter.enable \|\| lib.elem "nvidia" config.services.xserver.videoDrivers;
		message = ''`nvidia-container-toolkit` requires nvidia datacenter or desktop drivers: set `hardware.nvidia.datacenter.enable` or add "nvidia" to `services.xserver.videoDrivers`'';
		}];

		virtualisation.docker = {
		daemon.settings = lib.mkIf
		(lib.versionAtLeast config.virtualisation.docker.package.version "25") {
		@@ -130,9 +135,6 @@
		]);
		};

		services.xserver.videoDrivers = lib.mkIf
		(!config.hardware.nvidia.datacenter.enable) [ "nvidia" ];

		systemd.services.nvidia-container-toolkit-cdi-generator = {
		description = "Container Device Interface (CDI) for Nvidia generator";
		wantedBy = [ "multi-user.target" ];

+1 −4

Original line number	Diff line number	Diff line
		@@ -375,8 +375,5 @@ in
		};
		};

		meta.maintainers = with lib.maintainers; [
		erictapen
		nh2
		];
		meta.maintainers = with lib.maintainers; [ nh2 ];
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -979,7 +979,6 @@ in
		};

		meta.maintainers = with lib.maintainers; [
		erictapen
		Flakebi
		oddlama
		];