diff --git a/include/modules/niri/backend.hpp b/include/modules/niri/backend.hpp
index 01af5017..42b9ff7f 100644
--- a/include/modules/niri/backend.hpp
+++ b/include/modules/niri/backend.hpp
@@ -26,9 +26,9 @@ class IPC {
 
   // The data members are only safe to access while dataMutex_ is locked.
   std::lock_guard<std::mutex> lockData() { return std::lock_guard(dataMutex_); }
-  const std::vector<Json::Value> &workspaces() const { return workspaces_; }
-  const std::vector<Json::Value> &windows() const { return windows_; }
-  const std::vector<std::string> &keyboardLayoutNames() const { return keyboardLayoutNames_; }
+  const std::vector<Json::Value>& workspaces() const { return workspaces_; }
+  const std::vector<Json::Value>& windows() const { return windows_; }
+  const std::vector<std::string>& keyboardLayoutNames() const { return keyboardLayoutNames_; }
   unsigned keyboardLayoutCurrent() const { return keyboardLayoutCurrent_; }
 
  private:
diff --git a/include/modules/niri/language.hpp b/include/modules/niri/language.hpp
index 1cecd206..42b90ac4 100644
--- a/include/modules/niri/language.hpp
+++ b/include/modules/niri/language.hpp
@@ -10,7 +10,7 @@ namespace waybar::modules::niri {
 
 class Language : public ALabel, public EventHandler {
  public:
-  Language(const std::string&, const Bar&, const Json::Value&);
+  Language(const std::string &, const Bar &, const Json::Value &);
   ~Language() override;
   void update() override;
 
diff --git a/src/modules/niri/backend.cpp b/src/modules/niri/backend.cpp
index 6e251d31..383bf113 100644
--- a/src/modules/niri/backend.cpp
+++ b/src/modules/niri/backend.cpp
@@ -8,46 +8,47 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
-#include "giomm/datainputstream.h"
-#include "giomm/dataoutputstream.h"
-#include "giomm/unixinputstream.h"
-#include "giomm/unixoutputstream.h"
 
 #include <iostream>
 #include <string>
 #include <thread>
 
+#include "giomm/datainputstream.h"
+#include "giomm/dataoutputstream.h"
+#include "giomm/unixinputstream.h"
+#include "giomm/unixoutputstream.h"
+
 namespace waybar::modules::niri {
 
 int IPC::connectToSocket() {
-    const char* socket_path = getenv("NIRI_SOCKET");
+  const char *socket_path = getenv("NIRI_SOCKET");
 
-    if (socket_path == nullptr) {
-      spdlog::warn("Niri is not running, niri IPC will not be available.");
-      return -1;
-    }
+  if (socket_path == nullptr) {
+    spdlog::warn("Niri is not running, niri IPC will not be available.");
+    return -1;
+  }
 
-    struct sockaddr_un addr;
-    int socketfd = socket(AF_UNIX, SOCK_STREAM, 0);
+  struct sockaddr_un addr;
+  int socketfd = socket(AF_UNIX, SOCK_STREAM, 0);
 
-    if (socketfd == -1) {
-      throw std::runtime_error("socketfd failed");
-    }
+  if (socketfd == -1) {
+    throw std::runtime_error("socketfd failed");
+  }
 
-    addr.sun_family = AF_UNIX;
+  addr.sun_family = AF_UNIX;
 
-    strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
+  strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
 
-    addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
+  addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
 
-    int l = sizeof(struct sockaddr_un);
+  int l = sizeof(struct sockaddr_un);
 
-    if (connect(socketfd, (struct sockaddr*)&addr, l) == -1) {
-      close(socketfd);
-      throw std::runtime_error("unable to connect");
-    }
+  if (connect(socketfd, (struct sockaddr *)&addr, l) == -1) {
+    close(socketfd);
+    throw std::runtime_error("unable to connect");
+  }
 
-    return socketfd;
+  return socketfd;
 }
 
 void IPC::startIPC() {
@@ -61,8 +62,7 @@ void IPC::startIPC() {
       spdlog::error("Niri IPC: failed to start, reason: {}", e.what());
       return;
     }
-    if (socketfd == -1)
-      return;
+    if (socketfd == -1) return;
 
     spdlog::info("Niri IPC starting");
 
@@ -87,7 +87,7 @@ void IPC::startIPC() {
 
       try {
         parseIPC(line);
-      } catch (std::exception& e) {
+      } catch (std::exception &e) {
         spdlog::warn("Failed to parse IPC message: {}, reason: {}", line, e.what());
       } catch (...) {
         throw;
@@ -98,11 +98,10 @@ void IPC::startIPC() {
   }).detach();
 }
 
-void IPC::parseIPC(const std::string& line) {
+void IPC::parseIPC(const std::string &line) {
   const auto ev = parser_.parse(line);
   const auto members = ev.getMemberNames();
-  if (members.size() != 1)
-    throw std::runtime_error("Event must have a single member");
+  if (members.size() != 1) throw std::runtime_error("Event must have a single member");
 
   {
     auto lock = lockData();
@@ -112,17 +111,15 @@ void IPC::parseIPC(const std::string& line) {
       const auto &values = payload["workspaces"];
       std::copy(values.begin(), values.end(), std::back_inserter(workspaces_));
 
-      std::sort(workspaces_.begin(), workspaces_.end(),
-                [](const auto &a, const auto &b) {
-                  const auto &aOutput = a["output"].asString();
-                  const auto &bOutput = b["output"].asString();
-                  const auto aIdx = a["idx"].asUInt();
-                  const auto bIdx = b["idx"].asUInt();
-                  if (aOutput == bOutput)
-                    return aIdx < bIdx;
-                  return aOutput < bOutput;
-                });
-    } else if (const auto& payload = ev["WorkspaceActivated"]) {
+      std::sort(workspaces_.begin(), workspaces_.end(), [](const auto &a, const auto &b) {
+        const auto &aOutput = a["output"].asString();
+        const auto &bOutput = b["output"].asString();
+        const auto aIdx = a["idx"].asUInt();
+        const auto bIdx = b["idx"].asUInt();
+        if (aOutput == bOutput) return aIdx < bIdx;
+        return aOutput < bOutput;
+      });
+    } else if (const auto &payload = ev["WorkspaceActivated"]) {
       const auto id = payload["id"].asUInt64();
       const auto focused = payload["focused"].asBool();
       auto it = std::find_if(workspaces_.begin(), workspaces_.end(),
@@ -132,19 +129,18 @@ void IPC::parseIPC(const std::string& line) {
         const auto &output = ws["output"].asString();
         for (auto &ws : workspaces_) {
           const auto got_activated = (ws["id"].asUInt64() == id);
-          if (ws["output"] == output)
-            ws["is_active"] = got_activated;
+          if (ws["output"] == output) ws["is_active"] = got_activated;
 
-          if (focused)
-            ws["is_focused"] = got_activated;
+          if (focused) ws["is_focused"] = got_activated;
         }
       } else {
         spdlog::error("Activated unknown workspace");
       }
-    } else if (const auto& payload = ev["WorkspaceActiveWindowChanged"]) {
+    } else if (const auto &payload = ev["WorkspaceActiveWindowChanged"]) {
       const auto workspaceId = payload["workspace_id"].asUInt64();
-      auto it = std::find_if(workspaces_.begin(), workspaces_.end(),
-                             [workspaceId](const auto &ws) { return ws["id"].asUInt64() == workspaceId; });
+      auto it = std::find_if(workspaces_.begin(), workspaces_.end(), [workspaceId](const auto &ws) {
+        return ws["id"].asUInt64() == workspaceId;
+      });
       if (it != workspaces_.end()) {
         auto &ws = *it;
         ws["active_window_id"] = payload["active_window_id"];
@@ -157,9 +153,8 @@ void IPC::parseIPC(const std::string& line) {
       keyboardLayoutCurrent_ = layouts["current_idx"].asUInt();
 
       keyboardLayoutNames_.clear();
-      for (const auto &fullName : names)
-        keyboardLayoutNames_.push_back(fullName.asString());
-    } else if (const auto& payload = ev["KeyboardLayoutSwitched"]) {
+      for (const auto &fullName : names) keyboardLayoutNames_.push_back(fullName.asString());
+    } else if (const auto &payload = ev["KeyboardLayoutSwitched"]) {
       keyboardLayoutCurrent_ = payload["idx"].asUInt();
     } else if (const auto &payload = ev["WindowsChanged"]) {
       windows_.clear();
@@ -201,14 +196,14 @@ void IPC::parseIPC(const std::string& line) {
 
   std::unique_lock lock(callbackMutex_);
 
-  for (auto& [eventname, handler] : callbacks_) {
+  for (auto &[eventname, handler] : callbacks_) {
     if (eventname == members[0]) {
       handler->onEvent(ev);
     }
   }
 }
 
-void IPC::registerForIPC(const std::string& ev, EventHandler* ev_handler) {
+void IPC::registerForIPC(const std::string &ev, EventHandler *ev_handler) {
   if (ev_handler == nullptr) {
     return;
   }
@@ -217,7 +212,7 @@ void IPC::registerForIPC(const std::string& ev, EventHandler* ev_handler) {
   callbacks_.emplace_back(ev, ev_handler);
 }
 
-void IPC::unregisterForIPC(EventHandler* ev_handler) {
+void IPC::unregisterForIPC(EventHandler *ev_handler) {
   if (ev_handler == nullptr) {
     return;
   }
@@ -225,7 +220,7 @@ void IPC::unregisterForIPC(EventHandler* ev_handler) {
   std::unique_lock lock(callbackMutex_);
 
   for (auto it = callbacks_.begin(); it != callbacks_.end();) {
-    auto& [eventname, handler] = *it;
+    auto &[eventname, handler] = *it;
     if (handler == ev_handler) {
       it = callbacks_.erase(it);
     } else {
@@ -234,10 +229,9 @@ void IPC::unregisterForIPC(EventHandler* ev_handler) {
   }
 }
 
-Json::Value IPC::send(const Json::Value& request) {
+Json::Value IPC::send(const Json::Value &request) {
   int socketfd = connectToSocket();
-  if (socketfd == -1)
-    throw std::runtime_error("Niri is not running");
+  if (socketfd == -1) throw std::runtime_error("Niri is not running");
 
   auto unix_istream = Gio::UnixInputStream::create(socketfd, true);
   auto unix_ostream = Gio::UnixOutputStream::create(socketfd, false);
@@ -256,8 +250,7 @@ Json::Value IPC::send(const Json::Value& request) {
     throw std::runtime_error("error writing to niri socket");
 
   std::string line;
-  if (!istream->read_line(line))
-    throw std::runtime_error("error reading from niri socket");
+  if (!istream->read_line(line)) throw std::runtime_error("error reading from niri socket");
 
   std::istringstream iss(std::move(line));
   Json::Value response;
@@ -265,4 +258,4 @@ Json::Value IPC::send(const Json::Value& request) {
   return response;
 }
 
-}  // namespace waybar::modules::hyprland
+}  // namespace waybar::modules::niri
diff --git a/src/modules/niri/language.cpp b/src/modules/niri/language.cpp
index f124d4dd..1e4d6d10 100644
--- a/src/modules/niri/language.cpp
+++ b/src/modules/niri/language.cpp
@@ -12,8 +12,7 @@ Language::Language(const std::string &id, const Bar &bar, const Json::Value &con
     : ALabel(config, "language", id, "{}", 0, true), bar_(bar) {
   label_.hide();
 
-  if (!gIPC)
-    gIPC = std::make_unique<IPC>();
+  if (!gIPC) gIPC = std::make_unique<IPC>();
 
   gIPC->registerForIPC("KeyboardLayoutsChanged", this);
   gIPC->registerForIPC("KeyboardLayoutSwitched", this);
@@ -33,8 +32,7 @@ void Language::updateFromIPC() {
   auto ipcLock = gIPC->lockData();
 
   layouts_.clear();
-  for (const auto &fullName : gIPC->keyboardLayoutNames())
-    layouts_.push_back(getLayout(fullName));
+  for (const auto &fullName : gIPC->keyboardLayoutNames()) layouts_.push_back(getLayout(fullName));
 
   current_idx_ = gIPC->keyboardLayoutCurrent();
 }
@@ -89,7 +87,7 @@ void Language::update() {
   ALabel::update();
 }
 
-void Language::onEvent(const Json::Value& ev) {
+void Language::onEvent(const Json::Value &ev) {
   if (ev["KeyboardLayoutsChanged"]) {
     updateFromIPC();
   } else if (ev["KeyboardLayoutSwitched"]) {
@@ -102,10 +100,10 @@ void Language::onEvent(const Json::Value& ev) {
 }
 
 Language::Layout Language::getLayout(const std::string &fullName) {
-  auto* const context = rxkb_context_new(RXKB_CONTEXT_LOAD_EXOTIC_RULES);
+  auto *const context = rxkb_context_new(RXKB_CONTEXT_LOAD_EXOTIC_RULES);
   rxkb_context_parse_default_ruleset(context);
 
-  rxkb_layout* layout = rxkb_layout_first(context);
+  rxkb_layout *layout = rxkb_layout_first(context);
   while (layout != nullptr) {
     std::string nameOfLayout = rxkb_layout_get_description(layout);
 
@@ -115,10 +113,10 @@ Language::Layout Language::getLayout(const std::string &fullName) {
     }
 
     auto name = std::string(rxkb_layout_get_name(layout));
-    const auto* variantPtr = rxkb_layout_get_variant(layout);
+    const auto *variantPtr = rxkb_layout_get_variant(layout);
     std::string variant = variantPtr == nullptr ? "" : std::string(variantPtr);
 
-    const auto* descriptionPtr = rxkb_layout_get_brief(layout);
+    const auto *descriptionPtr = rxkb_layout_get_brief(layout);
     std::string description = descriptionPtr == nullptr ? "" : std::string(descriptionPtr);
 
     Layout info = Layout{nameOfLayout, name, variant, description};
diff --git a/src/modules/niri/window.cpp b/src/modules/niri/window.cpp
index b2405435..6e6fd36f 100644
--- a/src/modules/niri/window.cpp
+++ b/src/modules/niri/window.cpp
@@ -11,8 +11,7 @@ namespace waybar::modules::niri {
 
 Window::Window(const std::string &id, const Bar &bar, const Json::Value &config)
     : AAppIconLabel(config, "window", id, "{title}", 0, true), bar_(bar) {
-  if (!gIPC)
-    gIPC = std::make_unique<IPC>();
+  if (!gIPC) gIPC = std::make_unique<IPC>();
 
   gIPC->registerForIPC("WindowsChanged", this);
   gIPC->registerForIPC("WindowOpenedOrChanged", this);
@@ -22,13 +21,9 @@ Window::Window(const std::string &id, const Bar &bar, const Json::Value &config)
   dp.emit();
 }
 
-Window::~Window() {
-  gIPC->unregisterForIPC(this);
-}
+Window::~Window() { gIPC->unregisterForIPC(this); }
 
-void Window::onEvent(const Json::Value &ev) {
-  dp.emit();
-}
+void Window::onEvent(const Json::Value &ev) { dp.emit(); }
 
 void Window::doUpdate() {
   auto ipcLock = gIPC->lockData();
@@ -37,14 +32,13 @@ void Window::doUpdate() {
   const auto &workspaces = gIPC->workspaces();
 
   const auto separateOutputs = config_["separate-outputs"].asBool();
-  const auto ws_it = std::find_if(workspaces.cbegin(), workspaces.cend(),
-                                  [&](const auto &ws) {
-                                    if (separateOutputs) {
-                                      return ws["is_active"].asBool() && ws["output"].asString() == bar_.output->name;
-                                    }
+  const auto ws_it = std::find_if(workspaces.cbegin(), workspaces.cend(), [&](const auto &ws) {
+    if (separateOutputs) {
+      return ws["is_active"].asBool() && ws["output"].asString() == bar_.output->name;
+    }
 
-                                    return ws["is_focused"].asBool();
-                                  });
+    return ws["is_focused"].asBool();
+  });
 
   std::vector<Json::Value>::const_iterator it;
   if (ws_it == workspaces.cend() || (*ws_it)["active_window_id"].isNull()) {
@@ -67,37 +61,31 @@ void Window::doUpdate() {
 
     label_.show();
     label_.set_markup(waybar::util::rewriteString(
-        fmt::format(fmt::runtime(format_),
-                    fmt::arg("title", sanitizedTitle),
+        fmt::format(fmt::runtime(format_), fmt::arg("title", sanitizedTitle),
                     fmt::arg("app_id", sanitizedAppId)),
         config_["rewrite"]));
 
     updateAppIconName(appId, "");
 
-    if (tooltipEnabled())
-      label_.set_tooltip_text(title);
+    if (tooltipEnabled()) label_.set_tooltip_text(title);
 
     const auto id = window["id"].asUInt64();
     const auto workspaceId = window["workspace_id"].asUInt64();
-    const auto isSolo = std::none_of(windows.cbegin(), windows.cend(),
-                                     [&](const auto &win) {
-                                       return win["id"].asUInt64() != id && win["workspace_id"].asUInt64() == workspaceId;
-                                     });
+    const auto isSolo = std::none_of(windows.cbegin(), windows.cend(), [&](const auto &win) {
+      return win["id"].asUInt64() != id && win["workspace_id"].asUInt64() == workspaceId;
+    });
     setClass("solo", isSolo);
-    if (!appId.empty())
-      setClass(appId, isSolo);
+    if (!appId.empty()) setClass(appId, isSolo);
 
     if (oldAppId_ != appId) {
-      if (!oldAppId_.empty())
-        setClass(oldAppId_, false);
+      if (!oldAppId_.empty()) setClass(oldAppId_, false);
       oldAppId_ = appId;
     }
   } else {
     label_.hide();
     updateAppIconName("", "");
     setClass("solo", false);
-    if (!oldAppId_.empty())
-      setClass(oldAppId_, false);
+    if (!oldAppId_.empty()) setClass(oldAppId_, false);
     oldAppId_.clear();
   }
 }
diff --git a/src/modules/niri/workspaces.cpp b/src/modules/niri/workspaces.cpp
index 2ecfa1ba..d2fcad5d 100644
--- a/src/modules/niri/workspaces.cpp
+++ b/src/modules/niri/workspaces.cpp
@@ -7,9 +7,7 @@
 namespace waybar::modules::niri {
 
 Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config)
-    : AModule(config, "workspaces", id, false, false),
-      bar_(bar),
-      box_(bar.orientation, 0) {
+    : AModule(config, "workspaces", id, false, false), bar_(bar), box_(bar.orientation, 0) {
   box_.set_name("workspaces");
   if (!id.empty()) {
     box_.get_style_context()->add_class(id);
@@ -17,8 +15,7 @@ Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value
   box_.get_style_context()->add_class(MODULE_CLASS);
   event_box_.add(box_);
 
-  if (!gIPC)
-    gIPC = std::make_unique<IPC>();
+  if (!gIPC) gIPC = std::make_unique<IPC>();
 
   gIPC->registerForIPC("WorkspacesChanged", this);
   gIPC->registerForIPC("WorkspaceActivated", this);
@@ -27,13 +24,9 @@ Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value
   dp.emit();
 }
 
-Workspaces::~Workspaces() {
-  gIPC->unregisterForIPC(this);
-}
+Workspaces::~Workspaces() { gIPC->unregisterForIPC(this); }
 
-void Workspaces::onEvent(const Json::Value &ev) {
-  dp.emit();
-}
+void Workspaces::onEvent(const Json::Value &ev) { dp.emit(); }
 
 void Workspaces::doUpdate() {
   auto ipcLock = gIPC->lockData();
@@ -43,13 +36,12 @@ void Workspaces::doUpdate() {
   const auto &workspaces = gIPC->workspaces();
   std::copy_if(workspaces.cbegin(), workspaces.cend(), std::back_inserter(my_workspaces),
                [&](const auto &ws) {
-                 if (alloutputs)
-                   return true;
+                 if (alloutputs) return true;
                  return ws["output"].asString() == bar_.output->name;
                });
 
   // Remove buttons for removed workspaces.
-  for (auto it = buttons_.begin(); it != buttons_.end(); ) {
+  for (auto it = buttons_.begin(); it != buttons_.end();) {
     auto ws = std::find_if(my_workspaces.begin(), my_workspaces.end(),
                            [it](const auto &ws) { return ws["id"].asUInt64() == it->first; });
     if (ws == my_workspaces.end()) {
@@ -99,13 +91,10 @@ void Workspaces::doUpdate() {
 
     if (config_["format"].isString()) {
       auto format = config_["format"].asString();
-      name = fmt::format(
-          fmt::runtime(format),
-          fmt::arg("icon", getIcon(name, ws)),
-          fmt::arg("value", name),
-          fmt::arg("name", ws["name"].asString()),
-          fmt::arg("index", ws["idx"].asUInt()),
-          fmt::arg("output", ws["output"].asString()));
+      name = fmt::format(fmt::runtime(format), fmt::arg("icon", getIcon(name, ws)),
+                         fmt::arg("value", name), fmt::arg("name", ws["name"].asString()),
+                         fmt::arg("index", ws["idx"].asUInt()),
+                         fmt::arg("output", ws["output"].asString()));
     }
     if (!config_["disable-markup"].asBool()) {
       static_cast<Gtk::Label *>(button.get_children()[0])->set_markup(name);
@@ -129,8 +118,7 @@ void Workspaces::doUpdate() {
     const auto &ws = *it;
 
     auto pos = ws["idx"].asUInt() - 1;
-    if (alloutputs)
-      pos = it - my_workspaces.cbegin();
+    if (alloutputs) pos = it - my_workspaces.cbegin();
 
     auto &button = buttons_[ws["id"].asUInt64()];
     box_.reorder_child(button, pos);
@@ -176,27 +164,21 @@ Gtk::Button &Workspaces::addButton(const Json::Value &ws) {
 
 std::string Workspaces::getIcon(const std::string &value, const Json::Value &ws) {
   const auto &icons = config_["format-icons"];
-  if (!icons)
-    return value;
+  if (!icons) return value;
 
-  if (ws["is_focused"].asBool() && icons["focused"])
-    return icons["focused"].asString();
+  if (ws["is_focused"].asBool() && icons["focused"]) return icons["focused"].asString();
 
-  if (ws["is_active"].asBool() && icons["active"])
-    return icons["active"].asString();
+  if (ws["is_active"].asBool() && icons["active"]) return icons["active"].asString();
 
   if (ws["name"]) {
     const auto &name = ws["name"].asString();
-    if (icons[name])
-      return icons[name].asString();
+    if (icons[name]) return icons[name].asString();
   }
 
   const auto idx = ws["idx"].asString();
-  if (icons[idx])
-    return icons[idx].asString();
+  if (icons[idx]) return icons[idx].asString();
 
-  if (icons["default"])
-    return icons["default"].asString();
+  if (icons["default"]) return icons["default"].asString();
 
   return value;
 }