diff options
author | Ben Sima <ben@bsima.me> | 2025-01-02 16:20:21 -0500 |
---|---|---|
committer | Ben Sima <ben@bsima.me> | 2025-01-02 16:20:21 -0500 |
commit | 0fb4ae72c5754761fd7666e4274f4beef0484c32 (patch) | |
tree | d8820c808f31f287c3fcc266c02e3a26ddcdfbc3 /Omni/Lint.hs | |
parent | 3790d334c994db7a0e1eac9c130c2b1316c78c35 (diff) |
Switch to alejandra for nix formatting
I mostly wanted a formatter that would format `inherit` blocks
vertically, because otherwise they are super hard to read when diffing
or even just editing. Both alejandra and the new nixos/nixfmt format
verically like this, but alejandra has slightly better format (I guess)
and for some reason nixfmt did not respect my `GLOBIGNORE` setting when
doing `nixfmt **/*.nix` so it was trying to format stuff in `_/nix`, and
failed. So anyway I went with alejandra.
- https://github.com/kamadorueda/alejandra
- https://discourse.nixos.org/t/enforcing-nix-formatting-in-nixpkgs/49506
Diffstat (limited to 'Omni/Lint.hs')
-rwxr-xr-x | Omni/Lint.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Omni/Lint.hs b/Omni/Lint.hs index 0cc428a..c6b6878 100755 --- a/Omni/Lint.hs +++ b/Omni/Lint.hs @@ -15,7 +15,7 @@ -- : run deadnix -- : run shellcheck -- : run indent --- : run nixfmt +-- : run alejandra module Omni.Lint (main) where import Alpha @@ -224,10 +224,10 @@ decodeDeadnixOutput deadnixJson = formatDeadnixResult DeadnixResult {..} = file <> ":" <> show line <> ":" <> show column <> ": " <> message -nixfmt :: Linter -nixfmt = +alejandra :: Linter +alejandra = Linter - { exe = "nixfmt", + { exe = "alejandra", checkArgs = ["--check"], fixArgs = Nothing, decoder = Nothing @@ -279,7 +279,7 @@ runOne mode (ext, ns's) = results +> traverse printResult lint mode ruff ns's ] Namespace.Sh -> [lint mode shellcheck ns's] - Namespace.Nix -> [lint mode deadnix ns's, lint mode nixfmt ns's] + Namespace.Nix -> [lint mode deadnix ns's, lint mode alejandra ns's] Namespace.C -> [lint mode indent ns's] _ -> ns's |