From 1e702924c524d782ddaf18551a0900eccaf6e804 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jan 2024 08:29:59 +0300 Subject: [PATCH] fix: add/fix all the missing hooks, for real this time --- modules/hooks.nix | 4 ++-- nix/tools.nix | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/hooks.nix b/modules/hooks.nix index 52a184be..f162b44c 100644 --- a/modules/hooks.nix +++ b/modules/hooks.nix @@ -1013,8 +1013,8 @@ in mkOption { type = types.path; description = lib.mdDoc "`rome` binary path. E.g. if you want to use the `rome` in `node_modules`, use `./node_modules/.bin/rome`."; - default = "${tools.rome}/bin/rome"; - defaultText = "\${tools.rome}/bin/rome"; + default = "${tools.biome}/bin/biome"; + defaultText = "\${tools.biome}/bin/biome"; }; write = diff --git a/nix/tools.nix b/nix/tools.nix index c35bf7f8..358b6715 100644 --- a/nix/tools.nix +++ b/nix/tools.nix @@ -3,6 +3,7 @@ , actionlint , alejandra , ansible-lint +, biome , cabal-fmt , cabal2nix , callPackage @@ -10,6 +11,8 @@ , checkmake , clang-tools , clippy +, cljfmt +, cmake-format , commitizen , conform , convco @@ -20,6 +23,7 @@ , dune_3 , eclint , editorconfig-checker +, elixir , elmPackages , fprettify , git @@ -61,11 +65,13 @@ , stylish-haskell , stylua , tagref +, taplo , texlive , tflint , topiary ? null ## Added in nixpkgs on Dec 2, 2022 , typos , typst-fmt +, zprint , yamllint , writeScript , writeText @@ -87,11 +93,14 @@ in alejandra ansible-lint beautysh + biome cabal2nix cabal-fmt cargo clang-tools clippy + cljfmt + cmake-format conform convco crystal @@ -100,6 +109,7 @@ in dhall eclint editorconfig-checker + elixir fprettify git-annex go @@ -129,10 +139,12 @@ in stylish-haskell stylua tagref + taplo topiary typos typst-fmt yamllint + zprint ; inherit (elmPackages) elm-format elm-review elm-test; # TODO: these two should be statically compiled @@ -140,7 +152,7 @@ in inherit (luaPackages) luacheck; inherit (nodePackages) eslint markdownlint-cli prettier pyright cspell; inherit (ocamlPackages) ocp-indent; - inherit (python3Packages) black flake8 flynt isort mkdocs-linkcheck pylint; + inherit (python3Packages) autoflake black flake8 flynt isort mkdocs-linkcheck mypy pylint pyupgrade; inherit (php82Packages) php-cs-fixer phpcbf phpcs psalm; # FIXME: workaround build failure phpstan = php82Packages.phpstan.overrideAttrs (old: {