flake.lock

@@ -208,16 +208,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1714382886,
+        "lastModified": 1707300477,
-        "narHash": "sha256-+gooxbbYcP+MORKQ7W/C2ATvlonW+dyHgCUPnu5dfco=",
+        "narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=",
-        "owner": "brianmcgee",
+        "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "535e6904c34964ce56d8c092835c11fe6341acc8",
+        "rev": "ac599dab59a66304eb511af07b3883114f061b9d",
         "type": "github"
       },
       "original": {
-        "owner": "brianmcgee",
+        "owner": "numtide",
-        "ref": "feat/pipelines",
         "repo": "treefmt-nix",
         "type": "github"
       }

flake.nix

@@ -7,8 +7,7 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-root.url = "github:srid/flake-root";
     treefmt-nix = {
-      # todo switch back to numtide/treefmt-nix once merged
+      url = "github:numtide/treefmt-nix";
-      url = "github:brianmcgee/treefmt-nix/feat/pipelines";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     devshell = {

nix/packages.nix

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

nix/treefmt.nix

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