Switch formatting to nixfmt-tree

checks/default.nix

@@ -9,12 +9,7 @@
   ${system} = {
 
     # Check project formatting
-    format = pkgs.runCommand "nixfmt-check" { } ''
+    formatter = self.formatter.${system};
-      set -euo pipefail
-      cd ${self}
-      ${self.formatter.${system}}/bin/formatter . --check
-      mkdir $out
-    '';
 
     #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.lock

@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740485968,
+        "lastModified": 1741786315,
-        "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
+        "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
+        "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs-nixos-stable": {
       "locked": {
-        "lastModified": 1740865531,
+        "lastModified": 1742268799,
-        "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
+        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
+        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
     },
     "nixpkgs-nixos-unstable": {
       "locked": {
-        "lastModified": 1740828860,
+        "lastModified": 1742288794,
-        "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
+        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739262228,
+        "lastModified": 1742406979,
-        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+        "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+        "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
         "type": "github"
       },
       "original": {

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" ''
+      formatter.${system} = pkgs.nixfmt-tree;
-        ${pkgs.findutils}/bin/find $1 -type f -name '*.nix' -exec ${pkgs.nixfmt-rfc-style}/bin/nixfmt ''${@:2} {} +
-      '';
       nixosConfigurations = import ./nixos-configurations/default.nix importParams;
       nixosModules = import ./nixos-modules/default.nix importParams;
       packages = import ./packages/default.nix importParams;