Compare commits

..

No commits in common. "2be50b2690325487473fe27d77b63a7df4354a6a" and "06b5903b534c9ce19f00943bc31ca9932ca37525" have entirely different histories.

3 changed files with 11 additions and 18 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 = {
additionalRuntimePaths = [ additionalRuntimeDirectories = [
# 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 = {
additionalRuntimePaths = [ additionalRuntimeDirectories = [
# 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 = str; type = either str (listOf 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 as `"unnamed,unnamedplus"`, When `unnamed` and `unnamedplus` is included simultaneously yank and delete
yank and delete operations (but not put) will additionally copy the text into register `"*"`. 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.

View file

@ -57,21 +57,14 @@
signs = mkOption { signs = mkOption {
type = diagnosticType; type = diagnosticType;
default = false; default = false;
example = literalExpression '' example = {
signs.text = lib.generators.mkLuaInline ''' signs.text = {
{ "vim.diagnostic.severity.ERROR" = "󰅚 ";
[vim.diagnostic.severity.ERROR] = "󰅚 ", "vim.diagnostic.severity.WARN" = "󰀪 ";
[vim.diagnostic.severity.WARN] = "󰀪 ", };
} };
''';
'';
description = '' description = ''
Use signs for diagnostics. See {command}`:help diagnostic-signs`. Use signs for diagnostics. See {command}`:help diagnostic-signs`.
:::{.note}
The code presented in that example section uses Lua expressions as object keys which
only translate well if you use `lib.generators.mkLuaInline` as in the example.
:::
''; '';
}; };