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,28 +75,26 @@
       formatter = genSystems (
         pkgs:
         pkgs.treefmt.withConfig {
-          settings = [
-            {
-              formatter = {
-                clang-format = {
-                  options = [ "-i" ];
-                  command = lib.getExe' pkgs.clang-tools "clang-format";
-                  excludes = [ ];
-                  includes = [
-                    "*.c"
-                    "*.cpp"
-                    "*.h"
-                    "*.hpp"
-                  ];
-                };
-                nixfmt = {
-                  command = lib.getExe pkgs.nixfmt-rfc-style;
-                  includes = [ "*.nix" ];
-                };
+          settings = {
+            formatter = {
+              clang-format = {
+                options = [ "-i" ];
+                command = lib.getExe' pkgs.clang-tools "clang-format";
+                excludes = [ ];
+                includes = [
+                  "*.c"
+                  "*.cpp"
+                  "*.h"
+                  "*.hpp"
+                ];
               };
-              tree-root-file = ".git/index";
-            }
-          ];
+              nixfmt = {
+                command = lib.getExe pkgs.nixfmt;
+                includes = [ "*.nix" ];
+              };
+            };
+            tree-root-file = ".git/index";
+          };
         }
       );
 

nix/default.nix

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