Merge pull request 'feat/configure-treefmt-pipeline' (#32) from feat/…

…configure-treefmt-pipeline into main Reviewed-on: https://git.numtide.com/numtide/treefmt/pulls/32
numtide · May 1, 2024 · d3cdb69 · d3cdb69
2 parents 5d341f9 + 757d5e7
commit d3cdb69
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 21 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,7 +7,8 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-root.url = "github:srid/flake-root";
     treefmt-nix = {
-      url = "github:numtide/treefmt-nix";
+      # todo switch back to numtide/treefmt-nix once merged
+      url = "github:brianmcgee/treefmt-nix/feat/pipelines";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     devshell = {

diff --git a/nix/packages.nix b/nix/packages.nix
@@ -23,7 +23,9 @@
         in
           filter {
             root = ../.;
-            exclude = [./nix];
+            exclude = [
+              "nix"
+            ];
           };
 
         modules = ../gomod2nix.toml;

diff --git a/nix/treefmt.nix b/nix/treefmt.nix
@@ -22,20 +22,37 @@
         statix.enable = true;
       };
 
-      settings.formatter.prettier = {
-        options = ["--tab-width" "4"];
-        includes = [
-          "*.css"
-          "*.html"
-          "*.js"
-          "*.json"
-          "*.jsx"
-          "*.md"
-          "*.mdx"
-          "*.scss"
-          "*.ts"
-          "*.yaml"
-        ];
+      settings.formatter = {
+        deadnix = {
+          pipeline = "nix";
+          priority = 1;
+        };
+
+        statix = {
+          pipeline = "nix";
+          priority = 2;
+        };
+
+        alejandra = {
+          pipeline = "nix";
+          priority = 3;
+        };
+
+        prettier = {
+          options = ["--tab-width" "4"];
+          includes = [
+            "*.css"
+            "*.html"
+            "*.js"
+            "*.json"
+            "*.jsx"
+            "*.md"
+            "*.mdx"
+            "*.scss"
+            "*.ts"
+            "*.yaml"
+          ];
+        };
       };
     };