|
2 | 2 | let |
3 | 3 | inherit (config) hooks tools settings; |
4 | 4 | cfg = config; |
5 | | - inherit (lib) flatten mapAttrs mapAttrsToList mkDefault mkOption mkRenamedOptionModule types; |
| 5 | + inherit (lib) flatten mapAttrs mapAttrsToList mkDefault mkOption mkRemovedOptionModule mkRenamedOptionModule types; |
6 | 6 |
|
7 | 7 | hookModule = |
8 | 8 | [ |
|
33 | 33 | imports = |
34 | 34 | # Rename `settings.<name>.package` to `hooks.<name>.package` |
35 | 35 | map (name: mkRenamedOptionModule [ "settings" name "package" ] [ "hooks" name "package" ]) [ "alejandra" "eclint" "flynt" "mdl" "treefmt" ] |
36 | | - # Manually rename options that had a package option |
| 36 | + # These options were renamed in 20fbe2c9731810b1020572a2cb6cbf64e3dd3873 to avoid shadowing |
| 37 | + ++ map (name: mkRenamedOptionModule [ "settings" name "config" ] [ "hooks" name "settings" "configuration" ]) [ "lua-ls" "markdownlint" "typos" "vale" ] |
| 38 | + ++ [ |
| 39 | + (mkRemovedOptionModule [ "settings" "yamllint" "relaxed" ] '' |
| 40 | + This option has been removed. Use `hooks.yamllint.settings.preset = "relaxed"`. |
| 41 | + '') |
| 42 | + ] |
| 43 | + # Manually rename options that had a package or a config option |
37 | 44 | ++ flatten (mapAttrsToList (name: map (o: mkRenamedOptionModule [ "settings" name o ] [ "hooks" name "settings" o ])) { |
38 | 45 | "alejandra" = [ "check" "exclude" "threads" "verbosity" ]; |
39 | 46 | "eclint" = [ "fix" "summary" "color" "exclude" "verbosity" ]; |
40 | 47 | "flynt" = [ "aggressive" "binPath" "dry-run" "exclude" "fail-on-change" "line-length" "no-multiline" "quiet" "string" "transform-concats" "verbose" ]; |
41 | 48 | "mdl" = [ "configPath" "git-recurse" "ignore-front-matter" "json" "rules" "rulesets" "show-aliases" "warnings" "skip-default-ruleset" "style" "tags" "verbose" ]; |
| 49 | + "lua-ls" = [ "checklevel" ]; |
| 50 | + "typos" = [ "binary" "color" "configPath" "diff" "exclude" "format" "hidden" "ignored-words" "locale" "no-check-filenames" "no-check-files" "no-unicode" "quiet" "verbose" "write" ]; |
| 51 | + "vale" = [ "configPath" "flags" ]; |
| 52 | + "yamllint" = [ "configPath" ]; |
42 | 53 | }) |
43 | 54 | # Rename the remaining `settings.<name>` to `hooks.<name>.settings` |
44 | 55 | ++ map (name: mkRenamedOptionModule [ "settings" name ] [ "hooks" name "settings" ]) |
45 | | - [ "ansible-lint" "autoflake" "clippy" "cmake-format" "credo" "deadnix" "denofmt" "denolint" "dune-fmt" "eslint" "flake8" "headache" "hlint" "hpack" "isort" "latexindent" "lua-ls" "lychee" "markdownlint" "mkdocs-linkcheck" "mypy" "nixfmt" "ormolu" "php-cs-fixer" "phpcbf" "phpcs" "phpstan" "prettier" "psalm" "pylint" "pyright" "pyupgrade" "revive" "rome" "statix" "typos" "vale" "yamllint" ]; |
| 56 | + [ "ansible-lint" "autoflake" "clippy" "cmake-format" "credo" "deadnix" "denofmt" "denolint" "dune-fmt" "eslint" "flake8" "headache" "hlint" "hpack" "isort" "latexindent" "lychee" "mkdocs-linkcheck" "mypy" "nixfmt" "ormolu" "php-cs-fixer" "phpcbf" "phpcs" "phpstan" "prettier" "psalm" "pylint" "pyright" "pyupgrade" "revive" "rome" "statix" ]; |
46 | 57 |
|
47 | 58 | # PLEASE keep this sorted alphabetically. |
48 | 59 | options.settings = { |
|
2367 | 2378 | name = "markdownlint"; |
2368 | 2379 | description = "Style checker and linter for markdown files."; |
2369 | 2380 | package = tools.markdownlint-cli; |
2370 | | - entry = "${hooks.markdownlint.package}/bin/markdownlint -c ${pkgs.writeText "markdownlint.json" (builtins.toJSON hooks.markdownlint.settings.config)}"; |
| 2381 | + entry = "${hooks.markdownlint.package}/bin/markdownlint -c ${pkgs.writeText "markdownlint.json" (builtins.toJSON hooks.markdownlint.settings.configuration)}"; |
2371 | 2382 | files = "\\.md$"; |
2372 | 2383 | }; |
2373 | 2384 | mdl = |
|
0 commit comments