2023-12-21 10:22:59 +01:00
17 changed files with 143 additions and 242 deletions
--- a/flake.lock
+++ b/flake.lock
@ -2,15 +2,15 @@
  "nodes": {
    "devshell": {
      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1692523566,
-        "narHash": "sha256-VDJDihK6jNebVw9y3qKCVD6+6QaC/x8kxZzL4MaIPPY=",
+        "lastModified": 1676293499,
+        "narHash": "sha256-uIOTlTxvrXxpKeTvwBI1JGDGtCxMXE3BI0LFwoQMhiQ=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "d208c58e2f7afef838add5f18a9936b12a71d695",
+        "rev": "71e3022e3ab20bbf1342640547ef5bc14fb43bf4",
        "type": "github"
      },
      "original": {
@ -36,15 +36,27 @@
      }
    },
    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1642700792,
+        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
        "type": "github"
      },
      "original": {
@ -55,11 +67,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1677383253,
-        "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
+        "lastModified": 1643381941,
+        "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
+        "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5",
        "type": "github"
      },
      "original": {
@ -71,11 +83,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1692638711,
-        "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=",
+        "lastModified": 1676300157,
+        "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15",
+        "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462",
        "type": "github"
      },
      "original": {
@ -89,39 +101,9 @@
      "inputs": {
        "devshell": "devshell",
        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
        "nixpkgs": "nixpkgs_2"
      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -47,12 +47,17 @@
        let pkgs = import nixpkgs {
          inherit system;

-          overlays = [ devshell.overlays.default ];
+          overlays = [ devshell.overlay ];
        };
        in
        pkgs.devshell.mkShell {
          imports = [ "${pkgs.devshell.extraModulesDir}/language/c.nix" ];
-
+          commands = [
+            {
+              package = pkgs.devshell.cli;
+              help = "Per project developer environments";
+            }
+          ];
          devshell.packages = with pkgs; [
            clang-tools
            gdb
@ -74,7 +79,6 @@
            at-spi2-atk atkmm cairo cairomm catch2 fmt_8 fontconfig
            gdk-pixbuf glibmm gtk3 harfbuzz pango pangomm wayland-protocols
          ]);
-
          env = with pkgs; [
            { name = "CPLUS_INCLUDE_PATH"; prefix = "$DEVSHELL_DIR/include"; }
            { name = "PKG_CONFIG_PATH"; prefix = "$DEVSHELL_DIR/lib/pkgconfig"; }
--- a/include/modules/bluetooth.hpp
+++ b/include/modules/bluetooth.hpp
@ -59,8 +59,7 @@ class Bluetooth : public ALabel {
  auto getDeviceProperties(GDBusObject*, DeviceInfo&) -> bool;
  auto getControllerProperties(GDBusObject*, ControllerInfo&) -> bool;

-  // Returns std::nullopt if no controller could be found
-  auto findCurController() -> std::optional<ControllerInfo>;
+  auto findCurController(ControllerInfo&) -> bool;
  auto findConnectedDevices(const std::string&, std::vector<DeviceInfo>&) -> void;

 #ifdef WANT_RFKILL
@ -69,7 +68,7 @@ class Bluetooth : public ALabel {
  const std::unique_ptr<GDBusObjectManager, void (*)(GDBusObjectManager*)> manager_;

  std::string state_;
-  std::optional<ControllerInfo> cur_controller_;
+  ControllerInfo cur_controller_;
  std::vector<DeviceInfo> connected_devices_;
  DeviceInfo cur_focussed_device_;
  std::string device_enumerate_;
--- a/include/modules/custom.hpp
+++ b/include/modules/custom.hpp
@ -1,7 +1,6 @@
 #pragma once

 #include <fmt/format.h>
-#include <fmt/args.h>

 #include <csignal>
 #include <string>
@ -35,7 +34,6 @@ class Custom : public ALabel {
  std::string alt_;
  std::string tooltip_;
  std::vector<std::string> class_;
-  fmt::dynamic_format_arg_store<fmt::format_context> fields_;
  int percentage_;
  FILE* fp_;
  int pid_;
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@ -22,12 +22,10 @@ class Workspace {
  bool is_special() const { return is_special_; };
  bool is_persistent() const { return is_persistent_; };
  bool is_empty() const { return windows_ == 0; };
-  bool is_urgent() const { return is_urgent_; };

  auto handle_clicked(GdkEventButton* bt) -> bool;
  void set_active(bool value = true) { active_ = value; };
  void set_persistent(bool value = true) { is_persistent_ = value; };
-  void set_urgent(bool value = true) { is_urgent_ = value; };
  void set_windows(uint value) { windows_ = value; };

  void update(const std::string& format, const std::string& icon);
@ -40,7 +38,6 @@ class Workspace {
  bool active_ = false;
  bool is_special_ = false;
  bool is_persistent_ = false;
-  bool is_urgent_ = false;

  Gtk::Button button_;
  Gtk::Box content_;
@ -65,7 +62,6 @@ class Workspaces : public AModule, public EventHandler {
  void sort_workspaces();
  void create_workspace(Json::Value& value);
  void remove_workspace(std::string name);
-  void set_urgent_workspace(std::string windowaddress);

  bool all_outputs_ = false;
  bool show_special_ = false;
--- a/include/modules/keyboard_state.hpp
+++ b/include/modules/keyboard_state.hpp
@ -3,7 +3,6 @@
 #include <fmt/chrono.h>
 #include <gtkmm/label.h>

-#include <set>
 #include <unordered_map>

 #include "AModule.hpp"
@ -41,7 +40,6 @@ class KeyboardState : public AModule {

  struct libinput* libinput_;
  std::unordered_map<std::string, struct libinput_device*> libinput_devices_;
-  std::set<int> binding_keys;

  util::SleeperThread libinput_thread_, hotplug_thread_;
 };
--- a/man/waybar-bluetooth.5.scd
+++ b/man/waybar-bluetooth.5.scd
@ -42,10 +42,6 @@ Addressed by *bluetooth*
 	typeof: string ++
 	This format is used when the displayed controller is connected to at least 1 device.

-*format-no-controller*: ++
-	typeof: string ++
-	This format is used when no bluetooth controller could be found
-
 *format-icons*: ++
 	typeof: array/object ++
 	Based on the current battery percentage (see section *EXPERIMENTAL BATTERY PERCENTAGE FEATURE*), the corresponding icon gets selected. ++
@ -117,10 +113,6 @@ Addressed by *bluetooth*
 	typeof: string ++
 	This format is used when the displayed controller is connected to at least 1 device.

-*tooltip-format-no-controller*: ++
-	typeof: string ++
-	This format is used when no bluetooth controller could be found
-
 *tooltip-format-enumerate-connected*: ++
 	typeof: string ++
 	This format is used to define how each connected device should be displayed within the *device_enumerate* format replacement in the tooltip menu.
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@ -76,4 +76,3 @@ Additional to workspace name matching, the following *format-icons* can be set.
 - *#workspaces button.active*
 - *#workspaces button.persistent*
 - *#workspaces button.special*
- *#workspaces button.urgent*
--- a/man/waybar-keyboard-state.5.scd
+++ b/man/waybar-keyboard-state.5.scd
@ -48,11 +48,6 @@ You must be a member of the input group to use this module.
 	default: chooses first valid input device ++
 	Which libevdev input device to show the state of. Libevdev devices can be found in /dev/input. The device should support number lock, caps lock, and scroll lock events.

-*binding-keys*: ++
-	typeof: array ++
-	default: [58, 69, 70] ++
-	Customize the key to trigger this module, the key number can be find in /usr/include/linux/input-event-codes.h or running sudo libinput debug-events --show-keycodes.
-
 # FORMAT REPLACEMENTS

 *{name}*: Caps, Num, or Scroll.
--- a/src/modules/bluetooth.cpp
+++ b/src/modules/bluetooth.cpp
@ -92,30 +92,28 @@ waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value&
                   std::back_inserter(device_preference_), [](auto x) { return x.asString(); });
  }

-  // NOTE: assumption made that the controller that is selected stays unchanged
+  // NOTE: assumption made that the controller that is selcected stays unchanged
  // for duration of the module
-  if (cur_controller_ = findCurController(); !cur_controller_) {
+  if (!findCurController(cur_controller_)) {
    if (config_["controller-alias"].isString()) {
      spdlog::error("findCurController() failed: no bluetooth controller found with alias '{}'",
                    config_["controller-alias"].asString());
    } else {
      spdlog::error("findCurController() failed: no bluetooth controller found");
    }
-    update();
-  } else {
-    // These calls only make sense if a controller could be found
-    findConnectedDevices(cur_controller_->path, connected_devices_);
-    g_signal_connect(manager_.get(), "interface-proxy-properties-changed",
-                     G_CALLBACK(onInterfaceProxyPropertiesChanged), this);
-    g_signal_connect(manager_.get(), "interface-added", G_CALLBACK(onInterfaceAddedOrRemoved),
-                     this);
-    g_signal_connect(manager_.get(), "interface-removed", G_CALLBACK(onInterfaceAddedOrRemoved),
-                     this);
-
-#ifdef WANT_RFKILL
-    rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Bluetooth::update)));
-#endif
+    event_box_.hide();
+    return;
  }
+  findConnectedDevices(cur_controller_.path, connected_devices_);
+
+  g_signal_connect(manager_.get(), "interface-proxy-properties-changed",
+                   G_CALLBACK(onInterfaceProxyPropertiesChanged), this);
+  g_signal_connect(manager_.get(), "interface-added", G_CALLBACK(onInterfaceAddedOrRemoved), this);
+  g_signal_connect(manager_.get(), "interface-removed", G_CALLBACK(onInterfaceAddedOrRemoved),
+                   this);
+#ifdef WANT_RFKILL
+  rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Bluetooth::update)));
+#endif

  dp.emit();
 }
@ -146,16 +144,12 @@ auto waybar::modules::Bluetooth::update() -> void {

  std::string state;
  std::string tooltip_format;
-  if (cur_controller_) {
-    if (!cur_controller_->powered)
-      state = "off";
-    else if (!connected_devices_.empty())
-      state = "connected";
-    else
-      state = "on";
-  } else {
-    state = "no-controller";
-  }
+  if (!cur_controller_.powered)
+    state = "off";
+  else if (!connected_devices_.empty())
+    state = "connected";
+  else
+    state = "on";
 #ifdef WANT_RFKILL
  if (rfkill_.getState()) state = "disabled";
 #endif
@ -193,6 +187,8 @@ auto waybar::modules::Bluetooth::update() -> void {
    tooltip_format = config_["tooltip-format"].asString();
  }

+  format_.empty() ? event_box_.hide() : event_box_.show();
+
  auto update_style_context = [this](const std::string& style_class, bool in_next_state) {
    if (in_next_state && !label_.get_style_context()->has_class(style_class)) {
      label_.get_style_context()->add_class(style_class);
@ -200,32 +196,25 @@ auto waybar::modules::Bluetooth::update() -> void {
      label_.get_style_context()->remove_class(style_class);
    }
  };
-  update_style_context("discoverable", cur_controller_ ? cur_controller_->discoverable : false);
-  update_style_context("discovering", cur_controller_ ? cur_controller_->discovering : false);
-  update_style_context("pairable", cur_controller_ ? cur_controller_->pairable : false);
+  update_style_context("discoverable", cur_controller_.discoverable);
+  update_style_context("discovering", cur_controller_.discovering);
+  update_style_context("pairable", cur_controller_.pairable);
  if (!state_.empty()) {
    update_style_context(state_, false);
  }
  update_style_context(state, true);
  state_ = state;

-  if (format_.empty()) {
-    event_box_.hide();
-  } else {
-    event_box_.show();
-    label_.set_markup(fmt::format(
-        fmt::runtime(format_), fmt::arg("status", state_),
-        fmt::arg("num_connections", connected_devices_.size()),
-        fmt::arg("controller_address", cur_controller_ ? cur_controller_->address : "null"),
-        fmt::arg("controller_address_type",
-                 cur_controller_ ? cur_controller_->address_type : "null"),
-        fmt::arg("controller_alias", cur_controller_ ? cur_controller_->alias : "null"),
-        fmt::arg("device_address", cur_focussed_device_.address),
-        fmt::arg("device_address_type", cur_focussed_device_.address_type),
-        fmt::arg("device_alias", cur_focussed_device_.alias), fmt::arg("icon", icon_label),
-        fmt::arg("device_battery_percentage",
-                 cur_focussed_device_.battery_percentage.value_or(0))));
-  }
+  label_.set_markup(fmt::format(
+      fmt::runtime(format_), fmt::arg("status", state_),
+      fmt::arg("num_connections", connected_devices_.size()),
+      fmt::arg("controller_address", cur_controller_.address),
+      fmt::arg("controller_address_type", cur_controller_.address_type),
+      fmt::arg("controller_alias", cur_controller_.alias),
+      fmt::arg("device_address", cur_focussed_device_.address),
+      fmt::arg("device_address_type", cur_focussed_device_.address_type),
+      fmt::arg("device_alias", cur_focussed_device_.alias), fmt::arg("icon", icon_label),
+      fmt::arg("device_battery_percentage", cur_focussed_device_.battery_percentage.value_or(0))));

  if (tooltipEnabled()) {
    bool tooltip_enumerate_connections_ = config_["tooltip-format-enumerate-connected"].isString();
@ -261,10 +250,9 @@ auto waybar::modules::Bluetooth::update() -> void {
    label_.set_tooltip_text(fmt::format(
        fmt::runtime(tooltip_format), fmt::arg("status", state_),
        fmt::arg("num_connections", connected_devices_.size()),
-        fmt::arg("controller_address", cur_controller_ ? cur_controller_->address : "null"),
-        fmt::arg("controller_address_type",
-                 cur_controller_ ? cur_controller_->address_type : "null"),
-        fmt::arg("controller_alias", cur_controller_ ? cur_controller_->alias : "null"),
+        fmt::arg("controller_address", cur_controller_.address),
+        fmt::arg("controller_address_type", cur_controller_.address_type),
+        fmt::arg("controller_alias", cur_controller_.alias),
        fmt::arg("device_address", cur_focussed_device_.address),
        fmt::arg("device_address_type", cur_focussed_device_.address_type),
        fmt::arg("device_alias", cur_focussed_device_.alias), fmt::arg("icon", icon_tooltip),
@ -304,8 +292,8 @@ auto waybar::modules::Bluetooth::onInterfaceProxyPropertiesChanged(

  Bluetooth* bt = static_cast<Bluetooth*>(user_data);
  if (interface_name == "org.bluez.Adapter1") {
-    if (object_path == bt->cur_controller_->path) {
-      bt->getControllerProperties(G_DBUS_OBJECT(object_proxy), *bt->cur_controller_);
+    if (object_path == bt->cur_controller_.path) {
+      bt->getControllerProperties(G_DBUS_OBJECT(object_proxy), bt->cur_controller_);
      bt->dp.emit();
    }
  } else if (interface_name == "org.bluez.Device1" || interface_name == "org.bluez.Battery1") {
@ -390,23 +378,22 @@ auto waybar::modules::Bluetooth::getControllerProperties(GDBusObject* object,
  return false;
 }

-auto waybar::modules::Bluetooth::findCurController() -> std::optional<ControllerInfo> {
-  std::optional<ControllerInfo> controller_info;
+auto waybar::modules::Bluetooth::findCurController(ControllerInfo& controller_info) -> bool {
+  bool found_controller = false;

  GList* objects = g_dbus_object_manager_get_objects(manager_.get());
  for (GList* l = objects; l != NULL; l = l->next) {
    GDBusObject* object = G_DBUS_OBJECT(l->data);
-    ControllerInfo info;
-    if (getControllerProperties(object, info) &&
+    if (getControllerProperties(object, controller_info) &&
        (!config_["controller-alias"].isString() ||
-         config_["controller-alias"].asString() == info.alias)) {
-      controller_info = std::move(info);
+         config_["controller-alias"].asString() == controller_info.alias)) {
+      found_controller = true;
      break;
    }
  }
  g_list_free_full(objects, g_object_unref);

-  return controller_info;
+  return found_controller;
 }

 auto waybar::modules::Bluetooth::findConnectedDevices(const std::string& cur_controller_path,
@ -417,7 +404,7 @@ auto waybar::modules::Bluetooth::findConnectedDevices(const std::string& cur_con
    GDBusObject* object = G_DBUS_OBJECT(l->data);
    DeviceInfo device;
    if (getDeviceProperties(object, device) && device.connected &&
-        device.paired_controller == cur_controller_->path) {
+        device.paired_controller == cur_controller_.path) {
      connected_devices.push_back(device);
    }
  }
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@ -122,14 +122,14 @@ auto waybar::modules::Custom::update() -> void {
      (output_.out.empty() || output_.exit_code != 0)) {
    event_box_.hide();
  } else {
-    fields_.clear();
    if (config_["return-type"].asString() == "json") {
      parseOutputJson();
    } else {
      parseOutputRaw();
    }
-    auto str = fmt::vformat(format_, fields_);
-
+    auto str = fmt::format(fmt::runtime(format_), text_, fmt::arg("alt", alt_),
+                           fmt::arg("icon", getIcon(percentage_, alt_)),
+                           fmt::arg("percentage", percentage_));
    if (str.empty()) {
      event_box_.hide();
    } else {
@ -173,7 +173,6 @@ void waybar::modules::Custom::parseOutputRaw() {
      } else {
        text_ = line;
      }
-      fields_.push_back(text_);
      tooltip_ = line;
      class_.clear();
    } else if (i == 1) {
@ -190,45 +189,32 @@ void waybar::modules::Custom::parseOutputRaw() {
 void waybar::modules::Custom::parseOutputJson() {
  std::istringstream output(output_.out);
  std::string line;
-  getline(output, line);
  class_.clear();
-  auto parsed = parser_.parse(line);
-
-  // Preserve order so that first "{}" is resolved to "text" for backwards compatability
-  if (parsed["text"].isString()) {
-    auto str = parsed["text"].asString();
+  while (getline(output, line)) {
+    auto parsed = parser_.parse(line);
    if (config_["escape"].isBool() && config_["escape"].asBool()) {
-      str = Glib::Markup::escape_text(str);
+      text_ = Glib::Markup::escape_text(parsed["text"].asString());
+    } else {
+      text_ = parsed["text"].asString();
    }
-    fields_.push_back(str);
-  }
-
-  for (auto const& key : parsed.getMemberNames()) {
-    if (!parsed[key].isString()) continue;
-    auto str = parsed[key].asString();
    if (config_["escape"].isBool() && config_["escape"].asBool()) {
-      str = Glib::Markup::escape_text(str);
+      alt_ = Glib::Markup::escape_text(parsed["alt"].asString());
+    } else {
+      alt_ = parsed["alt"].asString();
    }
-    fields_.push_back(fmt::arg(key.c_str(), str));
-  }
-
-  tooltip_ = parsed["tooltip"].asString();
-  if (parsed["class"].isString()) {
-    class_.push_back(parsed["class"].asString());
-  } else if (parsed["class"].isArray()) {
-    for (auto const& c : parsed["class"]) {
-      class_.push_back(c.asString());
+    tooltip_ = parsed["tooltip"].asString();
+    if (parsed["class"].isString()) {
+      class_.push_back(parsed["class"].asString());
+    } else if (parsed["class"].isArray()) {
+      for (auto const& c : parsed["class"]) {
+        class_.push_back(c.asString());
+      }
    }
-  }
-
-  if (!parsed["percentage"].asString().empty() && parsed["percentage"].isNumeric()) {
-    percentage_ = (int)lround(parsed["percentage"].asFloat());
-  } else {
-    percentage_ = 0;
-  }
-
-  // Allow overriding icon from json, otherwise use percentage based icon
-  if (parsed["icon"].isNull()) {
-    fields_.push_back(fmt::arg("icon", getIcon(percentage_, alt_)));
+    if (!parsed["percentage"].asString().empty() && parsed["percentage"].isNumeric()) {
+      percentage_ = (int)lround(parsed["percentage"].asFloat());
+    } else {
+      percentage_ = 0;
+    }
+    break;
  }
 }
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@ -58,7 +58,6 @@ Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value
  gIPC->registerForIPC("openwindow", this);
  gIPC->registerForIPC("closewindow", this);
  gIPC->registerForIPC("movewindow", this);
-  gIPC->registerForIPC("urgent", this);
 }

 auto Workspaces::update() -> void {
@ -76,9 +75,6 @@ auto Workspaces::update() -> void {

  for (auto &workspace : workspaces_) {
    workspace->set_active(workspace->name() == active_workspace_name_);
-    if (workspace->name() == active_workspace_name_ && workspace.get()->is_urgent()) {
-      workspace->set_urgent(false);
-    }
    std::string &workspace_icon = icons_map_[""];
    if (with_icon_) {
      workspace_icon = workspace->select_icon(icons_map_);
@ -130,8 +126,6 @@ void Workspaces::onEvent(const std::string &ev) {
    }
  } else if (eventName == "openwindow" || eventName == "closewindow" || eventName == "movewindow") {
    update_window_count();
-  } else if (eventName == "urgent") {
-    set_urgent_workspace(payload);
  }

  dp.emit();
@ -329,7 +323,6 @@ void Workspace::update(const std::string &format, const std::string &icon) {
  add_or_remove_class(style_context, active(), "active");
  add_or_remove_class(style_context, is_special(), "special");
  add_or_remove_class(style_context, is_empty(), "persistent");
-  add_or_remove_class(style_context, is_urgent(), "urgent");

  label_.set_markup(fmt::format(fmt::runtime(format), fmt::arg("id", id()),
                                fmt::arg("name", name()), fmt::arg("icon", icon)));
@ -426,23 +419,4 @@ auto Workspace::handle_clicked(GdkEventButton *bt) -> bool {
  return false;
 }

-void Workspaces::set_urgent_workspace(std::string windowaddress) {
-  const Json::Value clients_json = gIPC->getSocket1JsonReply("clients");
-  int workspace_id;
-
-  for (Json::Value client_json : clients_json) {
-    if (client_json["address"].asString().ends_with(windowaddress)) {
-      workspace_id = client_json["workspace"]["id"].asInt();
-      break;
-    }
-  }
-
-  auto workspace =
-      std::find_if(workspaces_.begin(), workspaces_.end(),
-                   [&](std::unique_ptr<Workspace> &x) { return x->id() == workspace_id; });
-  if (workspace->get() != nullptr) {
-    workspace->get()->set_urgent();
-  }
-}
-
 }  // namespace waybar::modules::hyprland
--- a/src/modules/keyboard_state.cpp
+++ b/src/modules/keyboard_state.cpp
@ -142,21 +142,6 @@ waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar&
    }
  }

-  auto keys = config_["binding-keys"];
-  if (keys.isArray()) {
-    for (const auto& key : keys) {
-      if (key.isInt()) {
-        binding_keys.insert(key.asInt());
-      } else {
-        spdlog::warn("Cannot read key binding {} as int.", key.asString());
-      }
-    }
-  } else {
-    binding_keys.insert(KEY_CAPSLOCK);
-    binding_keys.insert(KEY_NUMLOCK);
-    binding_keys.insert(KEY_SCROLLLOCK);
-  }
-
  DIR* dev_dir = opendir(devices_path_.c_str());
  if (dev_dir == nullptr) {
    throw errno_error(errno, "Failed to open " + devices_path_);
@ -186,8 +171,14 @@ waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar&
          auto state = libinput_event_keyboard_get_key_state(keyboard_event);
          if (state == LIBINPUT_KEY_STATE_RELEASED) {
            uint32_t key = libinput_event_keyboard_get_key(keyboard_event);
-            if (binding_keys.contains(key)) {
-              dp.emit();
+            switch (key) {
+              case KEY_CAPSLOCK:
+              case KEY_NUMLOCK:
+              case KEY_SCROLLLOCK:
+                dp.emit();
+                break;
+              default:
+                break;
            }
          }
        }
--- a/src/modules/simpleclock.cpp
+++ b/src/modules/simpleclock.cpp
@ -18,13 +18,13 @@ auto waybar::modules::Clock::update() -> void {
  tzset();  // Update timezone information
  auto now = std::chrono::system_clock::now();
  auto localtime = fmt::localtime(std::chrono::system_clock::to_time_t(now));
-  auto text = fmt::format(fmt::runtime(format_), localtime);
+  auto text = fmt::format(format_, localtime);
  label_.set_markup(text);

  if (tooltipEnabled()) {
    if (config_["tooltip-format"].isString()) {
      auto tooltip_format = config_["tooltip-format"].asString();
-      auto tooltip_text = fmt::format(fmt::runtime(tooltip_format), localtime);
+      auto tooltip_text = fmt::format(tooltip_format, localtime);
      label_.set_tooltip_text(tooltip_text);
    } else {
      label_.set_tooltip_text(text);
--- a/subprojects/catch2.wrap
+++ b/subprojects/catch2.wrap
@ -1,10 +1,10 @@
 [wrap-file]
-directory = Catch2-3.4.0
-source_url = https://github.com/catchorg/Catch2/archive/v3.4.0.tar.gz
-source_filename = Catch2-3.4.0.tar.gz
-source_hash = 122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/catch2_3.4.0-1/Catch2-3.4.0.tar.gz
-wrapdb_version = 3.4.0-1
+directory = Catch2-3.3.2
+source_url = https://github.com/catchorg/Catch2/archive/v3.3.2.tar.gz
+source_filename = Catch2-3.3.2.tar.gz
+source_hash = 8361907f4d9bff3ae7c1edb027f813659f793053c99b67837a0c0375f065bae2
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/catch2_3.3.2-1/Catch2-3.3.2.tar.gz
+wrapdb_version = 3.3.2-1

 [provide]
 catch2 = catch2_dep
--- a/subprojects/fmt.wrap
+++ b/subprojects/fmt.wrap
@ -1,13 +1,12 @@
 [wrap-file]
-directory = fmt-9.1.0
-source_url = https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz
-source_filename = fmt-9.1.0.tar.gz
-source_hash = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
-patch_filename = fmt_9.1.0-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/fmt_9.1.0-2/get_patch
-patch_hash = 23e8c4829f3e63f509b5643fe6bb87cbed39eae9594c451b338475d14d051967
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_9.1.0-2/fmt-9.1.0.tar.gz
-wrapdb_version = 9.1.0-2
+directory = fmt-8.1.1
+source_url = https://github.com/fmtlib/fmt/archive/8.1.1.tar.gz
+source_filename = fmt-8.1.1.tar.gz
+source_hash = 3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+patch_filename = fmt_8.1.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/fmt_8.1.1-1/get_patch
+patch_hash = 6035a67c7a8c90bed74c293c7265c769f47a69816125f7566bccb8e2543cee5e

 [provide]
 fmt = fmt_dep
+
--- a/subprojects/spdlog.wrap
+++ b/subprojects/spdlog.wrap
@ -1,12 +1,13 @@
 [wrap-file]
-directory = spdlog-1.11.0
-source_url = https://github.com/gabime/spdlog/archive/v1.11.0.tar.gz
-source_filename = v1.11.0.tar.gz
-source_hash = ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
-patch_filename = spdlog_1.11.0-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.11.0-2/get_patch
-patch_hash = db1364fe89502ac67f245a6c8c51290a52afd74a51eed26fa9ecb5b3443df57a
-wrapdb_version = 1.11.0-2
+directory = spdlog-1.10.0
+source_url = https://github.com/gabime/spdlog/archive/v1.10.0.tar.gz
+source_filename = v1.10.0.tar.gz
+source_hash = 697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224
+patch_filename = spdlog_1.10.0-3_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.10.0-3/get_patch
+patch_hash = 5bb07b4af1e971817d4b886efbe077aaf6c36d72d3d7e461bbcf6631f3725704
+wrapdb_version = 1.10.0-3

 [provide]
 spdlog = spdlog_dep
+