all repos — searchix @ 03ebead32af418c6637d2235b1cb9ad5c06e2952

Search engine for NixOS, nix-darwin, home-manager and NUR users

chore: set up treefmt-nix and reformat

Alan Pearce
commit

03ebead32af418c6637d2235b1cb9ad5c06e2952

parent

8d2d0bc911591eff2f35b2d3c0eacee06793d4f3

1 file changed, 24 insertions(+), 10 deletions(-)

changed files
M nix/pre-commit-checks.nix → nix/pre-commit-checks.nix
@@ -1,5 +1,5 @@
-{ pkgs }:
-rec {
+{ pkgs, treefmtEval }:
+{
   src = ../.;
   hooks = {
     gotest.enable = false;

@@ -18,10 +18,6 @@ enable = true;
       # excludes is a regex
       excludes = [ "nix/overlays/.*" ];
     };
-    nixpkgs-fmt = {
-      enable = true;
-      excludes = [ "nix/overlays/.*" ];
-    };
 
     convco.enable = true;
 

@@ -29,11 +25,18 @@ check-case-conflicts.enable = true;
     check-symlinks.enable = true;
     editorconfig-checker = {
       enable = true;
-      excludes = [ "\.md$" "\.ya?ml$" ];
+      excludes = [
+        "\.md$"
+        "\.ya?ml$"
+      ];
     };
     prettier = {
       enable = true;
-      types_or = [ "plain-text" "yaml" "javascript" ];
+      types_or = [
+        "plain-text"
+        "yaml"
+        "javascript"
+      ];
       excludes = [ "CHANGELOG\.md$" ];
     };
 

@@ -52,7 +55,10 @@ go-mod-tidy = {
       enable = true;
       name = "go-mod-tidy";
       description = "Run `go mod tidy`";
-      types_or = [ "go" "go-mod" ];
+      types_or = [
+        "go"
+        "go-mod"
+      ];
       entry = "${pkgs.go}/bin/go mod tidy";
       pass_filenames = false;
     };

@@ -70,7 +76,10 @@ enable = true;
       name = "generate-default-config";
       description = "Ensure default configuration file is up-to-date";
       files = "^defaults.toml|internal/config/";
-      types_or = [ "go" "toml" ];
+      types_or = [
+        "go"
+        "toml"
+      ];
       entry =
         let
           script = pkgs.writeShellScript "generate-default-config" ''

@@ -78,6 +87,11 @@ ${pkgs.wgo}/bin/wgo run -exit ./cmd/searchix-web --print-default-config > defaults.toml
           '';
         in
         builtins.toString script;
+    };
+
+    treefmt = {
+      enable = true;
+      packageOverrides.treefmt = treefmtEval.config.build.wrapper;
     };
   };
 }