Merge pull request #4025 from khaneliman/format

flake.nix: add treefmt; treewide: clang and nix format

default.nix

@@ -1,10 +1,9 @@
-(import
+(import (
-  (
+  let
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
   fetchTarball {
     url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
     sha256 = lock.nodes.flake-compat.locked.narHash;
   }
-  )
+) { src = ./.; }).defaultNix
-  { src = ./.; }
-).defaultNix

flake.nix

@@ -9,48 +9,97 @@
     };
   };
 
-  outputs = { self, nixpkgs, ... }:
+  outputs =
+    { self, nixpkgs, ... }:
     let
       inherit (nixpkgs) lib;
-      genSystems = func: lib.genAttrs [
+      genSystems =
+        func:
+        lib.genAttrs
+          [
             "x86_64-linux"
             "aarch64-linux"
           ]
-        (system: func (import nixpkgs {
+          (
+            system:
+            func (
+              import nixpkgs {
                 inherit system;
                 overlays = with self.overlays; [
                   waybar
                 ];
-        }));
+              }
+            )
+          );
 
-      mkDate = longDate: (lib.concatStringsSep "-" [
+      mkDate =
+        longDate:
+        (lib.concatStringsSep "-" [
           (builtins.substring 0 4 longDate)
           (builtins.substring 4 2 longDate)
           (builtins.substring 6 2 longDate)
         ]);
     in
     {
-      devShells = genSystems
+      devShells = genSystems (pkgs: {
-        (pkgs:
+        default = pkgs.mkShell {
-          {
-            default =
-              pkgs.mkShell
-                {
           name = "waybar-shell";
 
           # inherit attributes from upstream nixpkgs derivation
-                  inherit (pkgs.waybar) buildInputs depsBuildBuild depsBuildBuildPropagated depsBuildTarget
+          inherit (pkgs.waybar)
-                    depsBuildTargetPropagated depsHostHost depsHostHostPropagated depsTargetTarget
+            buildInputs
-                    depsTargetTargetPropagated propagatedBuildInputs propagatedNativeBuildInputs strictDeps;
+            depsBuildBuild
+            depsBuildBuildPropagated
+            depsBuildTarget
+            depsBuildTargetPropagated
+            depsHostHost
+            depsHostHostPropagated
+            depsTargetTarget
+            depsTargetTargetPropagated
+            propagatedBuildInputs
+            propagatedNativeBuildInputs
+            strictDeps
+            ;
 
           # overrides for local development
-                  nativeBuildInputs = pkgs.waybar.nativeBuildInputs ++ (with pkgs; [
+          nativeBuildInputs =
+            pkgs.waybar.nativeBuildInputs
+            ++ (with pkgs; [
+              nixfmt-rfc-style
               clang-tools
               gdb
             ]);
         };
       });
 
+      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" ];
+                };
+              };
+              tree-root-file = ".git/index";
+            }
+          ];
+        }
+      );
+
       overlays = {
         default = self.overlays.waybar;
         waybar = final: prev: {
@@ -58,11 +107,15 @@
             waybar = prev.waybar;
             # take the first "version: '...'" from meson.build
             version =
-              (builtins.head (builtins.split "'"
+              (builtins.head (
-                (builtins.elemAt
+                builtins.split "'" (
-                  (builtins.split " version: '" (builtins.readFile ./meson.build))
+                  builtins.elemAt (builtins.split " version: '" (builtins.readFile ./meson.build)) 2
-                  2)))
+                )
-              + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+              ))
+              + "+date="
+              + (mkDate (self.lastModifiedDate or "19700101"))
+              + "_"
+              + (self.shortRev or "dirty");
           };
         };
       };

nix/default.nix

@@ -1,7 +1,8 @@
-{ lib
+{
-, pkgs
+  lib,
-, waybar
+  pkgs,
-, version
+  waybar,
+  version,
 }:
 let
   libcava = rec {
@@ -14,8 +15,7 @@ let
     };
   };
 in
-(waybar.overrideAttrs (
+(waybar.overrideAttrs (oldAttrs: {
-  oldAttrs: {
   inherit version;
 
   src = lib.cleanSourceWith {
@@ -26,9 +26,9 @@ in
   mesonFlags = lib.remove "-Dgtk-layer-shell=enabled" oldAttrs.mesonFlags;
 
   # downstream patch should not affect upstream
-    patches = [];
+  patches = [ ];
   # nixpkgs checks version, no need when building locally
-    nativeInstallCheckInputs = [];
+  nativeInstallCheckInputs = [ ];
 
   buildInputs = (builtins.filter (p: p.pname != "wireplumber") oldAttrs.buildInputs) ++ [
     pkgs.wireplumber
@@ -40,5 +40,4 @@ in
     patchShebangs .
     popd
   '';
-  }
+}))
-))

src/modules/sni/item.cpp

@@ -1,16 +1,16 @@
 #include "modules/sni/item.hpp"
-#include "modules/sni/icon_manager.hpp"
 
 #include <gdkmm/general.h>
 #include <glibmm/main.h>
 #include <gtkmm/tooltip.h>
 #include <spdlog/spdlog.h>
 
+#include <filesystem>
 #include <fstream>
 #include <map>
-#include <filesystem>
 
 #include "gdk/gdk.h"
+#include "modules/sni/icon_manager.hpp"
 #include "util/format.hpp"
 #include "util/gtk_icon.hpp"
 

src/modules/sni/tray.cpp

@@ -1,8 +1,9 @@
 #include "modules/sni/tray.hpp"
-#include "modules/sni/icon_manager.hpp"
 
 #include <spdlog/spdlog.h>
 
+#include "modules/sni/icon_manager.hpp"
+
 namespace waybar::modules::SNI {
 
 Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config)

src/modules/temperature.cpp

@@ -115,10 +115,10 @@ float waybar::modules::Temperature::getTemperature() {
   auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
 
   // First, try with dev.cpu
-  if ( (sysctlbyname(fmt::format("dev.cpu.{}.temperature", zone).c_str(), &temp, &size,
+  if ((sysctlbyname(fmt::format("dev.cpu.{}.temperature", zone).c_str(), &temp, &size, NULL, 0) ==
-                     NULL, 0) == 0) ||
+       0) ||
       (sysctlbyname(fmt::format("hw.acpi.thermal.tz{}.temperature", zone).c_str(), &temp, &size,
-                     NULL, 0) == 0) ) {
+                    NULL, 0) == 0)) {
     auto temperature_c = ((float)temp - 2732) / 10;
     return temperature_c;
   }

src/modules/wlr/taskbar.cpp

@@ -382,7 +382,7 @@ std::string Task::state_string(bool shortened) const {
     return res.substr(0, res.size() - 1);
 }
 
-void Task::handle_title(const char* title) {
+void Task::handle_title(const char *title) {
   if (title_.empty()) {
     spdlog::debug(fmt::format("Task ({}) setting title to {}", id_, title_));
   } else {