From bd2255044cfc7f401fa52c51a1984412e6793c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 8 Jul 2024 12:53:36 +0200
Subject: [PATCH] remove deprecated formatters

---
 treefmt.nix | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/treefmt.nix b/treefmt.nix
index d9152a4..de1aa6d 100644
--- a/treefmt.nix
+++ b/treefmt.nix
@@ -1,9 +1,9 @@
-{ lib, inputs, ... }: {
+{ inputs, ... }: {
   imports = [
     inputs.treefmt-nix.flakeModule
   ];
 
-  perSystem = { pkgs, ... }: {
+  perSystem = _: {
     treefmt = {
       # Used to find the project root
       projectRootFile = "flake.lock";
@@ -12,34 +12,18 @@
         deadnix.enable = true;
         deno.enable = true;
         mypy.enable = true;
+        ruff.check = true;
+        ruff.format = true;
         nixpkgs-fmt.enable = true;
         shellcheck.enable = true;
         shfmt.enable = true;
         statix.enable = true;
       };
 
-      settings.formatter =
-        let
-          sh-includes = [ "*.sh" "direnvrc" ];
-        in
-        {
-          python = {
-            command = "sh";
-            options = [
-              "-eucx"
-              ''
-                ${lib.getExe pkgs.ruff} --fix "$@"
-                ${lib.getExe pkgs.ruff} format "$@"
-              ''
-              "--" # this argument is ignored by bash
-            ];
-            includes = [ "*.py" ];
-          };
-
-          shellcheck.includes = sh-includes;
-
-          shfmt.includes = sh-includes;
-        };
+      settings.formatter = {
+        shellcheck.includes = [ "*.sh" "direnvrc" ];
+        shfmt.includes = [ "*.sh" "direnvrc" ];
+      };
     };
   };
 }