diff --git a/modules/programs/less.nix b/modules/programs/less.nix index a82adc46c..c8f8847f2 100644 --- a/modules/programs/less.nix +++ b/modules/programs/less.nix @@ -10,13 +10,17 @@ in { meta.maintainers = [ lib.maintainers.pamplemousse ]; + imports = [ + (lib.mkRenamedOptionModule [ "programs" "less" "keys" ] [ "programs" "less" "config" ]) + ]; + options = { programs.less = { enable = lib.mkEnableOption "less, opposite of more"; package = lib.mkPackageOption pkgs "less" { nullable = true; }; - keys = lib.mkOption { + config = lib.mkOption { type = lib.types.lines; default = ""; example = '' @@ -24,7 +28,7 @@ in t forw-line ''; description = '' - Extra configuration for {command}`less` written to + Configuration for {command}`less`, written to {file}`$XDG_CONFIG_HOME/lesskey`. ''; }; @@ -34,6 +38,6 @@ in config = lib.mkIf cfg.enable { home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; - xdg.configFile."lesskey" = lib.mkIf (cfg.keys != "") { text = cfg.keys; }; + xdg.configFile."lesskey" = lib.mkIf (cfg.config != "") { text = cfg.config; }; }; } diff --git a/tests/modules/programs/less/custom-keys.nix b/tests/modules/programs/less/custom-config.nix similarity index 54% rename from tests/modules/programs/less/custom-keys.nix rename to tests/modules/programs/less/custom-config.nix index b08b2bbc3..ee6755c9b 100644 --- a/tests/modules/programs/less/custom-keys.nix +++ b/tests/modules/programs/less/custom-config.nix @@ -1,18 +1,17 @@ +let + config = '' + s back-line + t forw-line + ''; +in { programs.less = { enable = true; - - keys = '' - s back-line - t forw-line - ''; + inherit config; }; nmt.script = '' assertFileExists home-files/.config/lesskey - assertFileContent home-files/.config/lesskey ${builtins.toFile "less.expected" '' - s back-line - t forw-line - ''} + assertFileContent home-files/.config/lesskey ${builtins.toFile "less.expected" config} ''; } diff --git a/tests/modules/programs/less/default.nix b/tests/modules/programs/less/default.nix index 9e56f6ab9..c109210d9 100644 --- a/tests/modules/programs/less/default.nix +++ b/tests/modules/programs/less/default.nix @@ -1,4 +1,4 @@ { - less-custom-keys = ./custom-keys.nix; - less-no-keys = ./no-keys.nix; + less-custom-config = ./custom-config.nix; + less-no-config = ./no-config.nix; } diff --git a/tests/modules/programs/less/no-keys.nix b/tests/modules/programs/less/no-config.nix similarity index 100% rename from tests/modules/programs/less/no-keys.nix rename to tests/modules/programs/less/no-config.nix