From c57fe2b791247478edde3d99b756699935f13a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 8 Jul 2024 12:55:14 +0200 Subject: [PATCH] modernize treefmt configuration --- treefmt.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/treefmt.nix b/treefmt.nix index de1aa6d..66167a0 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -3,10 +3,10 @@ inputs.treefmt-nix.flakeModule ]; - perSystem = _: { + perSystem = { treefmt = { # Used to find the project root - projectRootFile = "flake.lock"; + projectRootFile = ".git/config"; programs = { deadnix.enable = true; @@ -20,10 +20,14 @@ statix.enable = true; }; - settings.formatter = { - shellcheck.includes = [ "*.sh" "direnvrc" ]; - shfmt.includes = [ "*.sh" "direnvrc" ]; - }; + settings.formatter = + let + shellIncludes = [ "*.sh" "direnvrc" ]; + in + { + shellcheck.includes = shellIncludes; + shfmt.includes = shellIncludes; + }; }; }; }