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 10 commits into
base: master
Choose a base branch
from
Open

feat: nixfmt indent #627

Changes from all commits
Commits
Show all changes
10 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
fe44865
feat(nixfmt): remove 'visible = false'
shimeoki Oct 29, 2025
2b7cf87
refactor(nixfmt-rfc-style): options
shimeoki Oct 29, 2025
1d3be3c
feat(nixfmt): options
shimeoki Oct 29, 2025
018f1fc
feat(nixfmt...): use new options
shimeoki Oct 29, 2025
0a9f42d
Merge branch 'master' into feat/nixfmt-indent/main
shimeoki Oct 29, 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
54 changes: 46 additions & 8 deletions modules/hooks.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,14 +974,19 @@ in
};
nixfmt = mkOption {
description = "nixfmt hook";
visible = false;
type = types.submodule {
imports = [ hookModule ];
options.settings = {
width =
mkOption {
type = types.nullOr types.int;
description = "Line width.";
type = with types; nullOr int;
description = "Maximum width in characters.";
default = null;
};
indent =
mkOption {
type = with types; nullOr int;
description = "Number of spaces to use for indentation.";
default = null;
};
};
Expand All @@ -1008,8 +1013,14 @@ in
options.settings = {
width =
mkOption {
type = types.nullOr types.int;
description = "Line width.";
type = with types; nullOr int;
description = "Maximum width in characters.";
default = null;
};
indent =
mkOption {
type = with types; nullOr int;
description = "Number of spaces to use for indentation.";
default = null;
};
};
Expand Down Expand Up @@ -3461,23 +3472,50 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.fourm
name = "nixfmt";
description = "Official Nix code formatter.";
package = tools.nixfmt;
entry = "${hooks.nixfmt.package}/bin/nixfmt ${lib.optionalString (hooks.nixfmt.settings.width != null) "--width=${toString hooks.nixfmt.settings.width}"}";
entry =
let
nixfmt = hooks.nixfmt.package;
hasIndent = lib.versionAtLeast nixfmt.version "1.0.0";
cmdArgs = mkCmdArgs (with hooks.nixfmt.settings; [
[ (width != null) "--width=${builtins.toString width}" ]
[ (indent != null) "--indent=${builtins.toString indent}" ]
]);
in
lib.throwIf (hooks.nixfmt.settings.indent != null && !hasIndent) "`indent` option in `nixfmt` hook can only be used with version >= 1.0.0"
"${nixfmt}/bin/nixfmt ${cmdArgs}";
files = "\\.nix$";
};
nixfmt-classic =
{
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 =
let
nixfmt-classic = hooks.nixfmt-classic.package;
cmdArgs = mkCmdArgs (with hooks.nixfmt-classic.settings; [
[ (width != null) "--width=${builtins.toString width}" ]
]);
in
"${nixfmt-classic}/bin/nixfmt ${cmdArgs}";
files = "\\.nix$";
};
nixfmt-rfc-style =
{
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 =
let
nixfmt-rfc-style = hooks.nixfmt-rfc-style.package;
hasIndent = lib.versionAtLeast nixfmt-rfc-style.version "1.0.0";
cmdArgs = mkCmdArgs (with hooks.nixfmt-rfc-style.settings; [
[ (width != null) "--width=${builtins.toString width}" ]
[ (indent != null) "--indent=${builtins.toString indent}" ]
]);
in
lib.throwIf (hooks.nixfmt-rfc-style.settings.indent != null && !hasIndent) "`indent` option in `nixfmt-rfc-style` hook can only be used with version >= 1.0.0"
"${nixfmt-rfc-style}/bin/nixfmt ${cmdArgs}";
files = "\\.nix$";
};
nixpkgs-fmt =
Expand Down