Merge pull request #507 from nix-community/joerg-ci

flake.lock: Update
nix-community · Jul 14, 2024 · 104a507 · 104a507
2 parents 4fabc9b + ad378cf
commit 104a507
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 29 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/treefmt.nix b/treefmt.nix
@@ -1,17 +1,19 @@
-{ lib, inputs, ... }: {
+{ inputs, ... }: {
   imports = [
     inputs.treefmt-nix.flakeModule
   ];
 
-  perSystem = { pkgs, ... }: {
+  perSystem = {
     treefmt = {
       # Used to find the project root
-      projectRootFile = "flake.lock";
+      projectRootFile = ".git/config";
 
       programs = {
         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;
@@ -20,25 +22,11 @@
 
       settings.formatter =
         let
-          sh-includes = [ "*.sh" "direnvrc" ];
+          shellIncludes = [ "*.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;
+          shellcheck.includes = shellIncludes;
+          shfmt.includes = shellIncludes;
         };
     };
   };