checks/default.nix

@@ -9,12 +9,7 @@
   ${system} = {
 
     # Check project formatting
-    format = pkgs.runCommand "nixfmt-check" { } ''
-      set -euo pipefail
-      cd ${self}
-      ${self.formatter.${system}}/bin/formatter . --check
-      mkdir $out
-    '';
+    formatter = self.formatter.${system};
 
     #TODO(#29): Integration/System tests
 

dev-shells/default.nix

@@ -26,7 +26,7 @@
         deploy-rs
         nixVersions.git
         nixd
-        nixfmt-rfc-style
+        nixfmt-tree
         nixos-anywhere
         ssh-to-age
         pssh

flake.nix

@@ -50,9 +50,7 @@
       checks = import ./checks/default.nix importParams;
       deploy = import ./deploy/default.nix importParams;
       devShells = import ./dev-shells/default.nix importParams;
-      formatter.${system} = pkgs.writeShellScriptBin "formatter" ''
-        ${pkgs.findutils}/bin/find $1 -type f -name '*.nix' -exec ${pkgs.nixfmt-rfc-style}/bin/nixfmt ''${@:2} {} +
-      '';
+      formatter.${system} = pkgs.nixfmt-tree;
       nixosConfigurations = import ./nixos-configurations/default.nix importParams;
       nixosModules = import ./nixos-modules/default.nix importParams;
       packages = import ./packages/default.nix importParams;