less: enable options to be specified multiple times

This commit is contained in:
Benedikt Rips 2025-11-23 15:17:49 +01:00 committed by Austin Horstman
parent 4767a9c719
commit 07d79726f1
3 changed files with 18 additions and 9 deletions

View file

@ -37,11 +37,14 @@ in
options = lib.mkOption {
type =
with lib.types;
attrsOf (oneOf [
bool
int
str
]);
let
scalar = oneOf [
bool
int
str
];
in
attrsOf (either scalar (listOf scalar));
default = { };
description = "GNU-style options to be set via {env}`$LESS`.";
example = {

View file

@ -12,7 +12,10 @@ in
options = {
RAW-CONTROL-CHARS = true;
quiet = true;
wheel-lines = 3;
wheel-lines = [
3
1
];
};
};
@ -20,7 +23,7 @@ in
assertFileExists home-files/.config/lesskey
assertFileContent home-files/.config/lesskey ${builtins.toFile "less.expected" ''
#env
LESS = --RAW-CONTROL-CHARS --quiet --wheel-lines 3
LESS = --RAW-CONTROL-CHARS --quiet --wheel-lines 3 --wheel-lines 1
${config}''}
'';

View file

@ -4,7 +4,10 @@
options = {
RAW-CONTROL-CHARS = true;
quiet = true;
wheel-lines = 3;
wheel-lines = [
3
1
];
};
};
@ -12,7 +15,7 @@
assertFileExists home-files/.config/lesskey
assertFileContent home-files/.config/lesskey ${builtins.toFile "lesskey.expected" ''
#env
LESS = --RAW-CONTROL-CHARS --quiet --wheel-lines 3
LESS = --RAW-CONTROL-CHARS --quiet --wheel-lines 3 --wheel-lines 1
''}
'';
}