Merge branch 'main' into docs/diagnostic-signs

This commit is contained in:
Ching Pei Yang 2025-07-07 10:57:35 +02:00 committed by GitHub
commit 7199ee8ebf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View file

@ -23,7 +23,7 @@ manner.
# flake.nix. For the sake of the argument, we will assume that the Neovim lua # flake.nix. For the sake of the argument, we will assume that the Neovim lua
# configuration is in a nvim/ directory relative to flake.nix. # configuration is in a nvim/ directory relative to flake.nix.
vim = { vim = {
additionalRuntimeDirectories = [ additionalRuntimePaths = [
# This will be added to Neovim's runtime paths. Conceptually, this behaves # This will be added to Neovim's runtime paths. Conceptually, this behaves
# very similarly to ~/.config/nvim but you may not place a top-level # very similarly to ~/.config/nvim but you may not place a top-level
# init.lua to be able to require it directly. # init.lua to be able to require it directly.
@ -41,7 +41,7 @@ directory, and call it with [](#opt-vim.luaConfigRC).
```nix ```nix
{pkgs, ...}: { {pkgs, ...}: {
vim = { vim = {
additionalRuntimeDirectories = [ additionalRuntimePaths = [
# You can list more than one file here. # You can list more than one file here.
./nvim-custom-1 ./nvim-custom-1

View file

@ -20,7 +20,7 @@ in {
''; '';
registers = mkOption { registers = mkOption {
type = either str (listOf str); type = str;
default = ""; default = "";
example = "unnamedplus"; example = "unnamedplus";
description = '' description = ''
@ -33,8 +33,8 @@ in {
`"+"` ({command}`:h quoteplus`) instead of register `"*"` for all yank, delete, `"+"` ({command}`:h quoteplus`) instead of register `"*"` for all yank, delete,
change and put operations which would normally go to the unnamed register. change and put operations which would normally go to the unnamed register.
When `unnamed` and `unnamedplus` is included simultaneously yank and delete When `unnamed` and `unnamedplus` is included simultaneously as `"unnamed,unnamedplus"`,
operations (but not put) will additionally copy the text into register `"*"`. yank and delete operations (but not put) will additionally copy the text into register `"*"`.
Please see {command}`:h clipboard` for more details. Please see {command}`:h clipboard` for more details.