treefmt: migrate to nilla

flake.nix

@@ -29,8 +29,6 @@
       ];
 
       imports = [
-        inputs.treefmt.flakeModule
-
         ./assets
         ./hosts
         ./modules
@@ -39,27 +37,7 @@
 
       flake.devShells = transpose (builtins.mapAttrs (_: shell: shell.result) nilla.shells);
       flake.packages = transpose (builtins.mapAttrs (_: pkg: pkg.result) nilla.packages);
-
+      flake.formatter = nilla.packages.formatter.result;
-      perSystem = {
-        treefmt = {
-          programs.deadnix.enable = true;
-          programs.nixfmt.enable = true;
-          programs.statix.enable = true;
-          programs.fish_indent.enable = true;
-          programs.deno.enable = true;
-          programs.stylua.enable = true;
-          programs.shfmt.enable = true;
-          settings.global.excludes = [
-            # agenix
-            "*.age"
-
-            # racket
-            "*.rkt"
-            "**/rashrc"
-          ];
-          settings.on-unmatched = "fatal";
-        };
-      };
     };
 
   inputs = {

modules/nilla/builders/custom-load.nix

@@ -1,12 +1,7 @@
 { lib }:
 {
   config.builders.custom-load = {
-    settings.type = lib.types.submodule {
+    settings.type = lib.types.submodule { };
-      options.args = lib.options.create {
-        type = lib.types.null;
-        default.value = null;
-      };
-    };
     settings.default = { };
     build = pkg: lib.attrs.generate pkg.systems (system: pkg.package { inherit system; });
   };

nilla.nix

@@ -55,13 +55,23 @@
             name = "settei-base";
             paths = with (getPkgs system); [
               # TODO: wrappers
-              # helix
+              helix
-              # fish
+              fish
               git-commit-last
               git-fixup
             ];
           }
         );
+        formatter = {
+          inherit systems;
+          builder = "custom-load";
+          package =
+            { system }:
+            let
+              eval = inputs.treefmt.lib.evalModule inputs.nixpkgs.legacyPackages.${system} ./treefmt.nix;
+            in
+            eval.config.build.wrapper;
+        };
       };
 
     config.shells.default = {

treefmt.nix

@@ -0,0 +1,19 @@
+{
+  projectRootFile = "nilla.nix";
+  programs.deadnix.enable = true;
+  programs.nixfmt.enable = true;
+  programs.statix.enable = true;
+  programs.fish_indent.enable = true;
+  programs.deno.enable = true;
+  programs.stylua.enable = true;
+  programs.shfmt.enable = true;
+  settings.global.excludes = [
+    # agenix
+    "*.age"
+
+    # racket
+    "*.rkt"
+    "**/rashrc"
+  ];
+  settings.on-unmatched = "fatal";
+}