Skip to content

feat: nixfmt indent #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

feat: nixfmt indent #627

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10da3c0
feat(nixfmt-rfc-style): add indent option
shimeoki Sep 15, 2025
e0a5b77
refactor(nixfmt): extract option logic
shimeoki Sep 15, 2025
cb4dacc
refactor(nixfmt): generic arg function
shimeoki Sep 15, 2025
6db7302
refactor(nixfmt): exec variable
shimeoki Sep 15, 2025
e95a5e8
refactor(nixfmt...): use helpers
shimeoki Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions modules/hooks.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,12 @@ in
description = "Line width.";
default = null;
};
indent =
mkOption {
type = types.nullOr types.int;
description = "Line indent.";
default = null;
};
};
};
};
Expand Down Expand Up @@ -3393,27 +3399,48 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.fourm
files = "\\.nix$";
};
nixfmt =
let
inherit (hooks) nixfmt;
exec = "${nixfmt.package}/bin/nixfmt";
arg = name:
let opt = nixfmt.settings.${name}; in
lib.optionalString (opt != null) "--${name}=${toString opt}";
in
{
name = "nixfmt-deprecated";
description = "Deprecated Nix code prettifier. Use nixfmt-classic.";
package = tools.nixfmt;
entry = "${hooks.nixfmt.package}/bin/nixfmt ${lib.optionalString (hooks.nixfmt.settings.width != null) "--width=${toString hooks.nixfmt.settings.width}"}";
entry = "${exec} ${arg "width"}";
files = "\\.nix$";
};
nixfmt-classic =
let
nixfmt = hooks.nixfmt-classic;
exec = "${nixfmt.package}/bin/nixfmt";
arg = name:
let opt = nixfmt.settings.${name}; in
lib.optionalString (opt != null) "--${name}=${toString opt}";
in
{
name = "nixfmt-classic";
description = "Nix code prettifier (classic).";
package = tools.nixfmt-classic;
entry = "${hooks.nixfmt-classic.package}/bin/nixfmt ${lib.optionalString (hooks.nixfmt-classic.settings.width != null) "--width=${toString hooks.nixfmt-classic.settings.width}"}";
entry = "${exec} ${arg "width"}";
files = "\\.nix$";
};
nixfmt-rfc-style =
let
nixfmt = hooks.nixfmt-rfc-style;
exec = "${nixfmt.package}/bin/nixfmt";
arg = name:
let opt = nixfmt.settings.${name}; in
lib.optionalString (opt != null) "--${name}=${toString opt}";
in
{
name = "nixfmt-rfc-style";
description = "Nix code prettifier (RFC 166 style).";
package = tools.nixfmt-rfc-style;
entry = "${hooks.nixfmt-rfc-style.package}/bin/nixfmt ${lib.optionalString (hooks.nixfmt-rfc-style.settings.width != null) "--width=${toString hooks.nixfmt-rfc-style.settings.width}"}";
entry = "${exec} ${arg "width"} ${arg "indent"}";
files = "\\.nix$";
};
nixpkgs-fmt =
Expand Down