Merge pull request #4371 from khaneliman/nixfmt

fix(flake): fix formatter configuration

flake.nix

@@ -65,7 +65,7 @@
           nativeBuildInputs =
             pkgs.waybar.nativeBuildInputs
             ++ (with pkgs; [
-              nixfmt-rfc-style
+              nixfmt
               clang-tools
               gdb
             ]);
@@ -75,8 +75,7 @@
       formatter = genSystems (
         pkgs:
         pkgs.treefmt.withConfig {
-          settings = [
-            {
+          settings = {
             formatter = {
               clang-format = {
                 options = [ "-i" ];
@@ -90,13 +89,12 @@
                 ];
               };
               nixfmt = {
-                  command = lib.getExe pkgs.nixfmt-rfc-style;
+                command = lib.getExe pkgs.nixfmt;
                 includes = [ "*.nix" ];
               };
             };
             tree-root-file = ".git/index";
-            }
-          ];
+          };
         }
       );
 

nix/default.nix

@@ -30,10 +30,9 @@ in
   # nixpkgs checks version, no need when building locally
   nativeInstallCheckInputs = [ ];
 
-  buildInputs = (builtins.filter (p:
-    p.pname != "wireplumber" &&
-    p.pname != "gps"
-  ) oldAttrs.buildInputs) ++ [
+  buildInputs =
+    (builtins.filter (p: p.pname != "wireplumber" && p.pname != "gps") oldAttrs.buildInputs)
+    ++ [
       pkgs.wireplumber
       pkgs.gpsd
     ];