1 files changed, 20 insertions, 72 deletions

diff --git a/flake.nix b/flake.nix
index 2c000fc..5edd7bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -203,94 +203,34 @@
         hashi = prev.callPackage ./pkgs/hashi { };
       };
 
-      devShells = forAllSystems (
+      formatter = forAllSystems (
         system:
         let
           pkgs = pkgsFor system;
-
-          # Treefmt configuration
-          treefmtEval = treefmt-nix.lib.evalModule pkgs {
-            projectRootFile = "flake.nix";
-            programs = {
-              nixfmt.enable = true;
-              deadnix.enable = true;
-            };
-          };
-
-          # Pre-commit hooks
-          pre-commit-check = pre-commit-hooks.lib.${system}.run {
-            src = ./.;
-            hooks = {
-              check-merge-conflicts.enable = true;
-              deadnix.enable = true;
-              detect-private-keys.enable = true;
-              end-of-file-fixer.enable = true;
-              mixed-line-endings.enable = true;
-              shellcheck = {
-                enable = true;
-                excludes = [ "\\.envrc$" ];
-              };
-              flake-checker.enable = true;
-              treefmt = {
-                enable = true;
-                entry = "${treefmtEval.config.build.wrapper}/bin/treefmt --ci";
-              };
-              trim-trailing-whitespace.enable = true;
-            };
-          };
-
-          # Import any custom scripts
-          scripts = import ./flake/scripts {
-            inherit pkgs system inputs;
-          };
         in
-        {
-          default = pkgs.mkShellNoCC {
-            inherit (pre-commit-check) shellHook;
-            packages =
-              with pkgs;
-              [
-                nixos-rebuild
-                git
-                agenix.packages."${system}".default
-              ]
-              ++ scripts.all;
-          };
-        }
+        (treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper
       );
-      formatter = forAllSystems (
+
+      checks = forAllSystems (
         system:
         let
           pkgs = pkgsFor system;
-          treefmtEval = treefmt-nix.lib.evalModule pkgs {
-            projectRootFile = "flake.nix";
-            programs = {
-              nixfmt.enable = true;
-              deadnix.enable = true;
-            };
-          };
         in
-        treefmtEval.config.build.wrapper
+        {
+          formatting = (treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.check self;
+        }
       );
 
-      checks = forAllSystems (
+      devShells = forAllSystems (
         system:
         let
           pkgs = pkgsFor system;
 
-          treefmtEval = treefmt-nix.lib.evalModule pkgs {
-            projectRootFile = "flake.nix";
-            programs = {
-              nixfmt.enable = true;
-              deadnix.enable = true;
-            };
-          };
-
+          # Pre-commit hooks
           pre-commit-check = pre-commit-hooks.lib.${system}.run {
             src = ./.;
             hooks = {
               check-merge-conflicts.enable = true;
-              deadnix.enable = true;
               detect-private-keys.enable = true;
               end-of-file-fixer.enable = true;
               mixed-line-endings.enable = true;
@@ -299,16 +239,24 @@
                 excludes = [ "\\.envrc$" ];
               };
               flake-checker.enable = true;
+              trim-trailing-whitespace.enable = true;
               treefmt = {
                 enable = true;
-                entry = "${treefmtEval.config.build.wrapper}/bin/treefmt --ci";
+                package = (treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper;
               };
-              trim-trailing-whitespace.enable = true;
             };
           };
         in
         {
-          inherit pre-commit-check;
+          default = pkgs.mkShellNoCC {
+            inherit (pre-commit-check) shellHook;
+            buildInputs = pre-commit-check.enabledPackages;
+            packages = with pkgs; [
+              nixos-rebuild
+              git
+              agenix.packages.${system}.default
+            ];
+          };
         }
       );
     };