Skip to content

Commit 2dee9e8

Browse files
committed
Add nix fmt hook
fixes: cachix#287
1 parent 4e743a6 commit 2dee9e8

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

modules/hooks.nix

+8-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ in
4949
++ [ (mkRenamedOptionModule [ "settings" "rome" ] [ "hooks" "biome" "settings" ]) ]
5050
# Rename the remaining `settings.<name>` to `hooks.<name>.settings`
5151
++ map (name: mkRenamedOptionModule [ "settings" name ] [ "hooks" name "settings" ])
52-
[ "ansible-lint" "autoflake" "biome" "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" "statix" ];
52+
[ "ansible-lint" "autoflake" "biome" "clippy" "cmake-format" "credo" "deadnix" "denofmt" "denolint" "dune-fmt" "eslint" "flake8" "headache" "hlint" "hpack" "isort" "latexindent" "lychee" "mkdocs-linkcheck" "mypy" "nix" "nixfmt" "ormolu" "php-cs-fixer" "phpcbf" "phpcs" "phpstan" "prettier" "psalm" "pylint" "pyright" "pyupgrade" "revive" "statix" ];
5353

5454
options.hookModule = lib.mkOption {
5555
type = types.deferredModule;
@@ -2894,6 +2894,13 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.ormol
28942894
builtins.toString script;
28952895
files = "\\.nix$";
28962896
};
2897+
nix-fmt =
2898+
{
2899+
name = "nix-fmt";
2900+
description = "Nix formatter.";
2901+
package = tools.nix;
2902+
entry = "${hooks.nix.package}/bin/nix fmt";
2903+
};
28972904
# nixfmt was renamed to nixfmt-classic.
28982905
# The hook has been deprecated to free up the name for when the new RFC-style nixfmt becomes stable.
28992906
nixfmt = nixfmt-classic;

nix/tools.nix

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ in
134134
mdl
135135
mdsh
136136
nil
137+
nix
137138
nixpkgs-fmt
138139
ormolu
139140
pre-commit-hook-ensure-sops

0 commit comments

Comments
 (0)