Merge pull request #4696 from luoqing510/gtk4

fix: add const qualifier to Glib::ustring formatter to fix compile error
2025-12-18 18:57:22 +01:00 · 2025-12-13 21:51:58 +08:00 · 2024-02-19 22:42:00 +01:00 · 2024-02-19 23:02:47 +03:00 · 2024-02-19 22:47:25 +03:00 · 2024-02-19 22:26:05 +03:00
282 changed files with 5841 additions and 15843 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -15,15 +15,15 @@ Checks: >
  -readability-redundant-member-init,
  -readability-redundant-string-init,
  -readability-identifier-length
-# CheckOptions:
-#   - { key: readability-identifier-naming.NamespaceCase,          value: lower_case }
-#   - { key: readability-identifier-naming.ClassCase,              value: CamelCase  }
-#   - { key: readability-identifier-naming.StructCase,             value: CamelCase  }
-#   - { key: readability-identifier-naming.FunctionCase,           value: camelBack  }
-#   - { key: readability-identifier-naming.VariableCase,           value: camelBack  }
-#   - { key: readability-identifier-naming.PrivateMemberCase,      value: camelBack  }
-#   - { key: readability-identifier-naming.PrivateMemberSuffix,    value: _          }
-#   - { key: readability-identifier-naming.EnumCase,               value: CamelCase  }
-#   - { key: readability-identifier-naming.EnumConstantCase,       value: UPPER_CASE }
-#   - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }
-#   - { key: readability-identifier-naming.StaticConstantCase,     value: UPPER_CASE }
+CheckOptions:
+  - { key: readability-identifier-naming.NamespaceCase,          value: lower_case }
+  - { key: readability-identifier-naming.ClassCase,              value: CamelCase  }
+  - { key: readability-identifier-naming.StructCase,             value: CamelCase  }
+  - { key: readability-identifier-naming.FunctionCase,           value: camelBack  }
+  - { key: readability-identifier-naming.VariableCase,           value: camelBack  }
+  - { key: readability-identifier-naming.PrivateMemberCase,      value: camelBack  }
+  - { key: readability-identifier-naming.PrivateMemberPrefix,    value: m_         }
+  - { key: readability-identifier-naming.EnumCase,               value: CamelCase  }
+  - { key: readability-identifier-naming.EnumConstantCase,       value: UPPER_CASE }
+  - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }
+  - { key: readability-identifier-naming.StaticConstantCase,     value: UPPER_CASE }
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,65 +0,0 @@
-bug:
-  - "(crash|bug|error|coredump|freeze|segfault|issue|problem)"
-
-enhancement:
-  - "(feature|enhancement|improvement|request|suggestion)"
-
-hyprland:
-  - "(hyprland)"
-
-network:
-  - "(network|wifi|ethernet)"
-
-bluetooth:
-  - "(bluetooth|bluez)"
-
-sway:
-  - "(sway)"
-
-cpu:
-  - "(cpu)"
-
-memory:
-  - "(memory|ram)"
-
-disk:
-  - "(disk|storage)"
-
-battery:
-  - "(upower|battery)"
-
-sni:
-  - "(sni|tray)"
-
-dwl:
-  - "(dwl)"
-
-custom:
-  - "(custom|module|extension|plugin|script)"
-
-mpd:
-  - "(mpd|music)"
-
-audio:
-  - "(pulseaudio|alsa|jack|audio|pirewire|wireplumber)"
-
-temperature:
-  - "(temperature|thermal|hwmon)"
-
-clock:
-  - "(clock|time|date)"
-
-gamemode:
-  - "(gamemode|game|gaming)"
-
-inhibitor:
-  - "(inhibitor|idle|lock|suspend|hibernate|logout)"
-
-cava:
-  - "(cava|audio-visualizer)"
-
-backlight:
-  - "(backlight|brightness)"
-
-keyboard:
-  - "(keyboard|keymap|layout|shortcut)"
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -2,21 +2,14 @@ name: clang-format

 on: [push, pull_request]

-concurrency:
-  group: ${{ github.workflow }}-format-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  lint:
+  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      # TODO: bump to clang 19 release
-      # - uses: DoozyX/clang-format-lint-action@v0.18.2
-      - uses: DoozyX/clang-format-lint-action@558090054b3f39e3d6af24f0cd73b319535da809
-        name: clang-format
-        with:
-          source: "."
-          extensions: "hpp,h,cpp,c"
-          style: "file:.clang-format"
-          clangFormatVersion: 19
+    - uses: actions/checkout@v3
+    - uses: DoozyX/clang-format-lint-action@v0.16.2
+      name: clang-format
+      with:
+        source: '.'
+        extensions: 'hpp,h,cpp,c'
+        clangFormatVersion: 16    
--- a/.github/workflows/clang-tidy.yml.bak
+++ b/.github/workflows/clang-tidy.yml.bak
@@ -2,12 +2,8 @@ name: clang-tidy

 on: [push, pull_request]

-concurrency:
-  group: ${{ github.workflow }}-tidy-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  lint:
+  build:
    runs-on: ubuntu-latest
    container:
      image: alexays/waybar:debian
@@ -17,11 +13,7 @@ jobs:
        run: |
          meson -Dcpp_std=c++20 build  # necessary to generate compile_commands.json
          ninja -C build               # necessary to find certain .h files (xdg, wayland, etc.)
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'   # to be kept in sync with cpp-linter-action
-          update-environment: true # the python dist installed by the action needs LD_LIBRARY_PATH to work
-      - uses: cpp-linter/cpp-linter-action@v2.9.1
+      - uses: cpp-linter/cpp-linter-action@v2.7.5
        name: clang-tidy
        id: clang-tidy-check
        env:
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,34 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  workflow_dispatch:
-  schedule:
-    # run monthly
-    - cron: '0 0 1 * *'
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    if: github.event_name != 'schedule' || github.repository == 'Alexays/Waybar'
-    strategy:
-      fail-fast: false # don't fail the other jobs if one of the images fails to build
-      matrix:
-        os: [ 'alpine', 'archlinux', 'debian', 'fedora', 'gentoo', 'opensuse' ]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: Dockerfiles/${{ matrix.os }}
-          push: true
-          tags: alexays/waybar:${{ matrix.os }}
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -2,34 +2,28 @@ name: freebsd

 on: [push, pull_request]

-concurrency:
-  group: ${{ github.workflow }}-freebsd-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  build:
-    # Run actions in a FreeBSD VM on the ubuntu runner
+  clang:
+    # Run actions in a FreeBSD VM on the macos-12 runner
    # https://github.com/actions/runner/issues/385 - for FreeBSD runner support
-    runs-on: ubuntu-latest
+    # https://github.com/actions/virtual-environments/issues/4060 - for lack of VirtualBox on MacOS 11 runners
+    runs-on: macos-12
    steps:
      - uses: actions/checkout@v3
      - name: Test in FreeBSD VM
-        uses: cross-platform-actions/action@v0.28.0
+        uses: cross-platform-actions/action@v0.21.1
        timeout-minutes: 180
-        env:
-          CPPFLAGS: '-isystem/usr/local/include'
-          LDFLAGS:  '-L/usr/local/lib'
        with:
          operating_system: freebsd
-          version: "14.2"
-          environment_variables: CPPFLAGS LDFLAGS
-          sync_files: runner-to-vm
+          version: "13.2"
+          environment_variables: CPPFLAGS=-isystem/usr/local/include LDFLAGS=-L/usr/local/lib
          run: |
+            sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
            sudo pkg install -y git #  subprojects/date
            sudo pkg install -y catch evdev-proto gtk-layer-shell gtkmm30 jsoncpp \
              libdbusmenu libevdev libfmt libmpdclient libudev-devd meson \
-              pkgconf pipewire pulseaudio scdoc sndio spdlog wayland-protocols upower \
+              pkgconf pulseaudio scdoc sndio spdlog wayland-protocols upower \
              libinotify
-            meson setup build -Dman-pages=enabled
+            meson build -Dman-pages=enabled
            ninja -C build
            meson test -C build --no-rebuild --print-errorlogs --suite waybar
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,19 +0,0 @@
-name: "Issue Labeler"
-on:
-  issues:
-    types: [opened, edited]
-
-permissions:
-  issues: write
-  contents: read
-
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: github/issue-labeler@v3.4
-        with:
-          configuration-path: .github/labeler.yml
-          enable-versioned-regex: 0
-          include-title: 1
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -2,14 +2,9 @@ name: linux

 on: [push, pull_request]

-concurrency:
-  group: ${{ github.workflow }}-linux-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    strategy:
-      fail-fast: false
      matrix:
        distro:
          - alpine
@@ -19,6 +14,9 @@ jobs:
          - opensuse
          - gentoo
        cpp_std: [c++20]
+        include:
+          - distro: fedora
+            cpp_std: c++20

    runs-on: ubuntu-latest
    container:
@@ -27,7 +25,7 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - name: configure
-        run: meson setup -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
+        run: meson -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
      - name: build
        run: ninja -C build
      - name: test
--- a/.github/workflows/nix-tests.yml
+++ b/.github/workflows/nix-tests.yml
@@ -1,17 +0,0 @@
-name: "Nix-Tests"
-on:
-  pull_request:
-  push:
-jobs:
-  nix-flake-check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v27
-      with:
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-    - run: nix flake show
-    - run: nix flake check --print-build-logs
-    - run: nix build --print-build-logs
--- a/.github/workflows/nix-update-flake-lock.yml
+++ b/.github/workflows/nix-update-flake-lock.yml
@@ -1,22 +0,0 @@
-name: update-flake-lock
-on:
-  workflow_dispatch: # allows manual triggering
-  schedule:
-    - cron: '0 0 1 * *' # Run monthly
-  push:
-      paths:
-        - 'flake.nix'
-jobs:
-  lockfile:
-    runs-on: ubuntu-latest
-    if: github.event_name != 'schedule' || github.repository == 'Alexays/Waybar'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Install Nix
-        uses: cachix/install-nix-action@v27
-        with:
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v21
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ vgcore.*
 *.swp
 packagecache
 /subprojects/**/
-/subprojects/.wraplock
 /build*
 /dist
 /meson.egg-info
@@ -49,5 +48,3 @@ packagecache
 # Nix
 result
 result-*
-
-.ccls-cache
--- a/Dockerfiles/archlinux
+++ b/Dockerfiles/archlinux
@@ -3,5 +3,5 @@
 FROM archlinux:base-devel

 RUN pacman -Syu --noconfirm && \
-    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols glib2-devel pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl iniparser fftw && \
+    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl iniparser fftw && \
    sed -Ei 's/#(en_(US|GB)\.UTF)/\1/' /etc/locale.gen && locale-gen
--- a/Dockerfiles/debian
+++ b/Dockerfiles/debian
@@ -1,49 +1,13 @@
 # vim: ft=Dockerfile

-FROM debian:sid-slim
+FROM debian:sid

 RUN apt update && \
-    apt install --no-install-recommends --no-install-suggests -y \
-        build-essential \
-        catch2 \
-        cmake \
-        git \
-        gobject-introspection \
-        libdbusmenu-gtk3-dev \
-        libegl1-mesa-dev \
-        libfmt-dev \
-        libgbm-dev \
-        libgirepository1.0-dev \
-        libgles2-mesa-dev \
-        libgtk-layer-shell-dev \
-        libgtkmm-3.0-dev \
-        libhowardhinnant-date-dev \
-        libiniparser-dev \
-        libinput-dev     \
-        libjack-jackd2-dev \
-        libjsoncpp-dev \
-        libmpdclient-dev \
-        libnl-3-dev \
-        libnl-genl-3-dev \
-        libpixman-1-dev  \
-        libplayerctl-dev \
-        libpugixml-dev \
-        libpulse-dev \
-        libsndio-dev \
-        libspdlog-dev \
-        libudev-dev \
-        libupower-glib-dev \
-        libwayland-dev \
-        libwireplumber-0.5-dev \
-        libxkbcommon-dev \
-        libxkbregistry-dev \
-        locales \
-        meson \
-        ninja-build \
-        pkg-config \
-        python3-pip \
-        python3-venv \
-        scdoc \
-        sudo \
-        wayland-protocols \
-    && apt clean
+    apt install -y \
+        build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev     \
+        wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev                      \
+        libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev  \
+        libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev     \
+        libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev \
+        libxkbregistry-dev libxkbregistry0 libplayerctl-dev sudo python3-venv python3-pip &&        \
+    apt clean
--- a/Dockerfiles/fedora
+++ b/Dockerfiles/fedora
@@ -29,6 +29,6 @@ RUN dnf install -y @c-development \
    'pkgconfig(wayland-client)' \
    'pkgconfig(wayland-cursor)' \
    'pkgconfig(wayland-protocols)' \
-    'pkgconfig(wireplumber-0.5)' \
+    'pkgconfig(wireplumber-0.4)' \
    'pkgconfig(xkbregistry)' && \
    dnf clean all -y
--- a/Dockerfiles/gentoo
+++ b/Dockerfiles/gentoo
@@ -6,6 +6,6 @@ RUN export FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox -sandbox -usersa
 		emerge --sync && \
 		eselect news read --quiet new 1>/dev/null 2>&1 && \
 		emerge --verbose --update --deep --with-bdeps=y --backtrack=30 --newuse @world && \
-		USE="wayland gtk3 gtk -doc X pulseaudio minimal" emerge dev-vcs/git dev-libs/wayland dev-libs/wayland-protocols dev-cpp/gtkmm:3.0 x11-libs/libxkbcommon \
+		USE="wayland gtk3 gtk -doc X pulseaudio minimal" emerge dev-vcs/git dev-libs/wayland dev-libs/wayland-protocols =dev-cpp/gtkmm-3.24.6 x11-libs/libxkbcommon \
 		x11-libs/gtk+:3 dev-libs/libdbusmenu dev-libs/libnl sys-power/upower media-libs/libpulse dev-libs/libevdev media-libs/libmpdclient \
 		media-sound/sndio gui-libs/gtk-layer-shell app-text/scdoc media-sound/playerctl dev-libs/iniparser sci-libs/fftw
--- a/Dockerfiles/opensuse
+++ b/Dockerfiles/opensuse
@@ -6,4 +6,4 @@ RUN zypper -n up && \
    zypper addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo | echo 'a' && \
    zypper -n refresh && \
    zypper -n install -t pattern devel_C_C++ && \
-    zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel libxkbregistry-devel scdoc playerctl-devel python3-packaging
+    zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel libxkbregistry-devel scdoc playerctl-devel
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2025 Alex
+Copyright (c) 2018 Alex

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/10
+++ b/10
@@ -3,11 +3,11 @@
 default: build

 build:
-	meson setup build
+	meson build
 	ninja -C build

 build-debug:
-	meson setup build --buildtype=debug
+	meson build --buildtype=debug
 	ninja -C build

 install: build
@@ -20,12 +20,8 @@ debug-run: build-debug
 	./build/waybar --log-level debug

 test:
-	meson test -C build --verbose --suite waybar
+	meson test -C build --no-rebuild --verbose --suite waybar
 .PHONY: test

-test-detailed:
-	meson test -C build --verbose --print-errorlogs --test-args='--reporter console -s'
-.PHONY: test-detailed
-
 clean:
 	rm -rf build
--- a/README.md
+++ b/README.md
@@ -8,13 +8,11 @@
 - Sway (Workspaces, Binding mode, Focused window name)
 - River (Mapping mode, Tags, Focused window name)
 - Hyprland (Window Icons, Workspaces, Focused window name)
- Niri (Workspaces, Focused window name, Language)
- DWL (Tags, Focused window name) [requires dwl ipc patch](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/ipc)
+- DWL (Tags) [requires dwl ipc patch](https://github.com/djpohly/dwl/wiki/ipc)
 - Tray [#21](https://github.com/Alexays/Waybar/issues/21)
 - Local time
 - Battery
 - UPower
- Power profiles daemon
 - Network
 - Bluetooth
 - Pulseaudio
@@ -38,7 +36,7 @@

 Waybar is available from a number of Linux distributions:

-[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg?columns=3&header=Waybar%20Downstream%20Packaging)](https://repology.org/project/waybar/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg)](https://repology.org/project/waybar/versions)

 An Ubuntu PPA with more recent versions is available
 [here](https://launchpad.net/~nschloe/+archive/ubuntu/waybar).
@@ -49,7 +47,7 @@ An Ubuntu PPA with more recent versions is available
 ```bash
 $ git clone https://github.com/Alexays/Waybar
 $ cd Waybar
-$ meson setup build
+$ meson build
 $ ninja -C build
 $ ./build/waybar
 # If you want to install it
@@ -116,36 +114,6 @@ sudo apt install \
  libxkbregistry-dev
 ```

-On Arch, you can use this command:
-
-```
-pacman -S --asdeps \
-  gtkmm3 \
-  jsoncpp \
-  libsigc++ \
-  fmt \
-  wayland \
-  chrono-date \
-  spdlog \
-  gtk3 \
-  gobject-introspection \
-  libgirepository \
-  libpulse \
-  libnl \
-  libappindicator-gtk3 \
-  libdbusmenu-gtk3 \
-  libmpdclient \
-  sndio \
-  libevdev \
-  libxkbcommon \
-  upower \
-  meson \
-  cmake \
-  scdoc \
-  wayland-protocols \
-  glib2-devel
-```
-

 Contributions welcome!<br>
 Have fun :)<br>
--- a/asan.supp
+++ b/asan.supp
@@ -1,5 +0,0 @@
-# Suppress common address sanitizer issues in dependencies, these are often non-fixable or not an issue.
-# Use it like this (when in repo root): ASAN_OPTIONS="suppressions=./asan.supp" ./build/waybar
-leak:libpangoft2-1.0.so.0
-leak:libgtk-3.so.0
-leak:libfontconfig.so.1
--- a/default.nix
+++ b/default.nix
@@ -1,9 +1,10 @@
-(import (
-  let
-    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
+(import
+  (
+    let 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
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -18,11 +18,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1766902085,
-        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+        "lastModified": 1704538339,
+        "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+        "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -9,118 +9,59 @@
    };
  };

-  outputs =
-    { self, nixpkgs, ... }:
+  outputs = { self, nixpkgs, ... }:
    let
      inherit (nixpkgs) lib;
-      genSystems =
-        func:
-        lib.genAttrs
-          [
-            "x86_64-linux"
-            "aarch64-linux"
-          ]
-          (
-            system:
-            func (
-              import nixpkgs {
-                inherit system;
-                overlays = with self.overlays; [
-                  waybar
-                ];
-              }
-            )
-          );
+      genSystems = func: lib.genAttrs [
+        "x86_64-linux"
+        "aarch64-linux"
+      ]
+        (system: func (import nixpkgs { inherit system; }));

-      mkDate =
-        longDate:
-        (lib.concatStringsSep "-" [
-          (builtins.substring 0 4 longDate)
-          (builtins.substring 4 2 longDate)
-          (builtins.substring 6 2 longDate)
-        ]);
+      mkDate = longDate: (lib.concatStringsSep "-" [
+        (builtins.substring 0 4 longDate)
+        (builtins.substring 4 2 longDate)
+        (builtins.substring 6 2 longDate)
+      ]);
    in
    {
-      devShells = genSystems (pkgs: {
-        default = pkgs.mkShell {
-          name = "waybar-shell";
+      devShells = genSystems
+        (pkgs:
+          {
+            default =
+              pkgs.mkShell
+                {
+                  name = "waybar-shell";

-          # inherit attributes from upstream nixpkgs derivation
-          inherit (pkgs.waybar)
-            buildInputs
-            depsBuildBuild
-            depsBuildBuildPropagated
-            depsBuildTarget
-            depsBuildTargetPropagated
-            depsHostHost
-            depsHostHostPropagated
-            depsTargetTarget
-            depsTargetTargetPropagated
-            propagatedBuildInputs
-            propagatedNativeBuildInputs
-            strictDeps
-            ;
+                  # inherit attributes from upstream nixpkgs derivation
+                  inherit (pkgs.waybar) buildInputs depsBuildBuild depsBuildBuildPropagated depsBuildTarget
+                    depsBuildTargetPropagated depsHostHost depsHostHostPropagated depsTargetTarget
+                    depsTargetTargetPropagated propagatedBuildInputs propagatedNativeBuildInputs strictDeps;

-          # overrides for local development
-          nativeBuildInputs =
-            pkgs.waybar.nativeBuildInputs
-            ++ (with pkgs; [
-              nixfmt
-              clang-tools
-              gdb
-            ]);
-        };
-      });
+                  # overrides for local development
+                  nativeBuildInputs = pkgs.waybar.nativeBuildInputs ++ (with pkgs; [
+                    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;
-                includes = [ "*.nix" ];
-              };
-            };
-            tree-root-file = ".git/index";
-          };
-        }
-      );
-
-      overlays = {
-        default = self.overlays.waybar;
-        waybar = final: prev: {
-          waybar = final.callPackage ./nix/default.nix {
-            waybar = prev.waybar;
-            # take the first "version: '...'" from meson.build
-            version =
-              (builtins.head (
-                builtins.split "'" (
-                  builtins.elemAt (builtins.split " version: '" (builtins.readFile ./meson.build)) 2
-                )
-              ))
-              + "+date="
-              + (mkDate (self.lastModifiedDate or "19700101"))
-              + "_"
-              + (self.shortRev or "dirty");
-          };
+      overlays.default = final: prev: {
+        waybar = final.callPackage ./nix/default.nix {
+          # take the first "version: '...'" from meson.build
+          version =
+            (builtins.head (builtins.split "'"
+              (builtins.elemAt
+                (builtins.split " version: '" (builtins.readFile ./meson.build))
+                2)))
+            + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
        };
      };

-      packages = genSystems (pkgs: {
-        default = self.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
-        inherit (pkgs) waybar;
-      });
+      packages = genSystems (pkgs:
+        let packages = self.overlays.default pkgs pkgs;
+        in packages // {
+          default = packages.waybar;
+        });
    };
 }
--- a/include/ALabel.hpp
+++ b/include/ALabel.hpp
@@ -21,16 +21,12 @@ class ALabel : public AModule {
 protected:
  Gtk::Label label_;
  std::string format_;
-  const std::chrono::milliseconds interval_;
+  const std::chrono::seconds interval_;
  bool alt_ = false;
  std::string default_format_;

-  bool handleToggle(GdkEventButton *const &e) override;
+//todo  bool handleToggle(GdkEventButton *const &e) override;
  virtual std::string getState(uint8_t value, bool lesser = false);
-
-  std::map<std::string, GtkMenuItem *> submenus_;
-  std::map<std::string, std::string> menuActionsMap_;
-  static void handleGtkMenuEvent(GtkMenuItem *menuitem, gpointer data);
 };

 }  // namespace waybar
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -2,8 +2,7 @@

 #include <glibmm/dispatcher.h>
 #include <glibmm/markup.h>
-#include <gtkmm.h>
-#include <gtkmm/eventbox.h>
+//#include <gtkmm/eventbox.h>
 #include <json/json.h>

 #include "IModule.hpp"
@@ -14,17 +13,15 @@ class AModule : public IModule {
 public:
  static constexpr const char *MODULE_CLASS = "module";

-  ~AModule() override;
+  virtual ~AModule();
  auto update() -> void override;
-  virtual auto refresh(int shouldRefresh) -> void {};
+  virtual auto refresh(int) -> void{};
  operator Gtk::Widget &() override;
  auto doAction(const std::string &name) -> void override;

  /// Emitting on this dispatcher triggers a update() call
  Glib::Dispatcher dp;

-  bool expandEnabled() const;
-
 protected:
  // Don't need to make an object directly
  // Derived classes are able to use it
@@ -33,32 +30,25 @@ class AModule : public IModule {

  enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };

-  SCROLL_DIR getScrollDir(GdkEventScroll *e);
-  bool tooltipEnabled() const;
+//  SCROLL_DIR getScrollDir(GdkEventScroll *e);
+  bool tooltipEnabled();

-  std::vector<int> pid_children_;
  const std::string name_;
  const Json::Value &config_;
-  Gtk::EventBox event_box_;
+//  Gtk::EventBox event_box_;

-  virtual void setCursor(Gdk::CursorType const &c);
-
-  virtual bool handleToggle(GdkEventButton *const &ev);
-  virtual bool handleMouseEnter(GdkEventCrossing *const &ev);
-  virtual bool handleMouseLeave(GdkEventCrossing *const &ev);
-  virtual bool handleScroll(GdkEventScroll *);
-  virtual bool handleRelease(GdkEventButton *const &ev);
-  GObject *menu_;
+//  virtual bool handleToggle(GdkEventButton *const &ev);
+//  virtual bool handleScroll(GdkEventScroll *);
+//  virtual bool handleRelease(GdkEventButton *const &ev);

 private:
-  bool handleUserEvent(GdkEventButton *const &ev);
+//  bool handleUserEvent(GdkEventButton *const &ev);
  const bool isTooltip;
-  const bool isExpand;
-  bool hasUserEvents_;
+  std::vector<int> pid_;
  gdouble distance_scrolled_y_;
  gdouble distance_scrolled_x_;
  std::map<std::string, std::string> eventActionMap_;
-  static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
+ /* static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
      {std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
      {std::make_pair(1, GdkEventType::GDK_BUTTON_RELEASE), "on-click-release"},
      {std::make_pair(1, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click"},
@@ -78,7 +68,7 @@ class AModule : public IModule {
      {std::make_pair(9, GdkEventType::GDK_BUTTON_PRESS), "on-click-forward"},
      {std::make_pair(9, GdkEventType::GDK_BUTTON_RELEASE), "on-click-forward-release"},
      {std::make_pair(9, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-forward"},
-      {std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"}};
+      {std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"}};*/
 };

 }  // namespace waybar
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -1,20 +1,13 @@
 #pragma once

 #include <gdkmm/monitor.h>
-#include <glibmm/refptr.h>
 #include <gtkmm/box.h>
+#include <gtkmm/centerbox.h>
 #include <gtkmm/cssprovider.h>
-#include <gtkmm/main.h>
 #include <gtkmm/window.h>
-#include <json/json.h>
-
-#include <memory>
-#include <optional>
-#include <vector>

 #include "AModule.hpp"
-#include "group.hpp"
-#include "util/kill_signal.hpp"
+//#include "group.hpp"
 #include "xdg-output-unstable-v1-client-protocol.h"

 namespace waybar {
@@ -55,7 +48,7 @@ class BarIpcClient;
 }
 #endif  // HAVE_SWAY

-class Bar : public sigc::trackable {
+class Bar {
 public:
  using bar_mode_map = std::map<std::string, struct bar_mode>;
  static const bar_mode_map PRESET_MODES;
@@ -67,21 +60,18 @@ class Bar : public sigc::trackable {
  ~Bar();

  void setMode(const std::string &mode);
-  void setVisible(bool value);
+  void setVisible(bool visible);
  void toggle();
-  void show();
-  void hide();
  void handleSignal(int);
-  util::KillSignalAction getOnSigusr1Action();
-  util::KillSignalAction getOnSigusr2Action();

  struct waybar_output *output;
  Json::Value config;
  struct wl_surface *surface;
  bool visible = true;
  Gtk::Window window;
-  Gtk::Orientation orientation = Gtk::ORIENTATION_HORIZONTAL;
-  Gtk::PositionType position = Gtk::POS_TOP;
+  Glib::RefPtr<Gdk::Surface> gdk_surface_;
+  Gtk::Orientation orientation = Gtk::Orientation::HORIZONTAL;
+  Gtk::PositionType position = Gtk::PositionType::TOP;

  int x_global;
  int y_global;
@@ -91,15 +81,15 @@ class Bar : public sigc::trackable {
 #endif

 private:
-  void onMap(GdkEventAny *);
+  void onMap();
  auto setupWidgets() -> void;
-  void getModules(const Factory &, const std::string &, waybar::Group *);
+//  void getModules(const Factory &, const std::string &, waybar::Group *);
  void setupAltFormatKeyForModule(const std::string &module_name);
  void setupAltFormatKeyForModuleList(const char *module_list_name);
  void setMode(const bar_mode &);
  void setPassThrough(bool passthrough);
  void setPosition(Gtk::PositionType position);
-  void onConfigure(GdkEventConfigure *ev);
+  void onConfigure(int width, int height);
  void configureGlobalOffset(int width, int height);
  void onOutputGeometryChanged();

@@ -114,7 +104,7 @@ class Bar : public sigc::trackable {
  Gtk::Box left_;
  Gtk::Box center_;
  Gtk::Box right_;
-  Gtk::Box box_;
+  Gtk::CenterBox box_;
  std::vector<std::shared_ptr<waybar::AModule>> modules_left_;
  std::vector<std::shared_ptr<waybar::AModule>> modules_center_;
  std::vector<std::shared_ptr<waybar::AModule>> modules_right_;
@@ -123,9 +113,6 @@ class Bar : public sigc::trackable {
  std::unique_ptr<BarIpcClient> _ipc_client;
 #endif
  std::vector<std::shared_ptr<waybar::AModule>> modules_all_;
-
-  waybar::util::KillSignalAction onSigusr1 = util::SIGNALACTION_DEFAULT_SIGUSR1;
-  waybar::util::KillSignalAction onSigusr2 = util::SIGNALACTION_DEFAULT_SIGUSR2;
 };

 }  // namespace waybar
--- a/include/client.hpp
+++ b/include/client.hpp
@@ -1,13 +1,9 @@
 #pragma once

-#include <fmt/format.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkwayland.h>
-#include <wayland-client.h>
+#include <gdk/wayland/gdkwayland.h>

 #include "bar.hpp"
 #include "config.hpp"
-#include "util/css_reload_helper.hpp"
 #include "util/portal.hpp"

 struct zwp_idle_inhibitor_v1;
@@ -33,6 +29,7 @@ class Client {

 private:
  Client() = default;
+  Glib::RefPtr<Gio::ListModel> monitors_;
  const std::string getStyle(const std::string &style, std::optional<Appearance> appearance);
  void bindInterfaces();
  void handleOutput(struct waybar_output &output);
@@ -50,14 +47,9 @@ class Client {
  void handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor);
  void handleDeferredMonitorRemoval(Glib::RefPtr<Gdk::Monitor> monitor);

-  Glib::RefPtr<Gtk::StyleContext> style_context_;
  Glib::RefPtr<Gtk::CssProvider> css_provider_;
  std::unique_ptr<Portal> portal;
  std::list<struct waybar_output> outputs_;
-  std::unique_ptr<CssReloadHelper> m_cssReloadHelper;
-  std::string m_cssFile;
-  sigc::connection monitor_added_connection_;
-  sigc::connection monitor_removed_connection_;
 };

 }  // namespace waybar
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -20,9 +20,6 @@ class Config {
  static std::optional<std::string> findConfigPath(
      const std::vector<std::string> &names, const std::vector<std::string> &dirs = CONFIG_DIRS);

-  static std::vector<std::string> tryExpandPath(const std::string &base,
-                                                const std::string &filename);
-
  Config() = default;

  void load(const std::string &config);
@@ -35,8 +32,6 @@ class Config {
  void setupConfig(Json::Value &dst, const std::string &config_file, int depth);
  void resolveConfigIncludes(Json::Value &config, int depth);
  void mergeConfig(Json::Value &a_config_, Json::Value &b_config_);
-  static std::vector<std::string> findIncludePath(
-      const std::string &name, const std::vector<std::string> &dirs = CONFIG_DIRS);

  std::string config_file_;

--- a/include/factory.hpp
+++ b/include/factory.hpp
@@ -1,13 +1,110 @@
 #pragma once

 #include <json/json.h>
-
-#include <AModule.hpp>
+#if defined(HAVE_CHRONO_TIMEZONES) || defined(HAVE_LIBDATE)
+#include "modules/clock.hpp"
+#else
+#include "modules/simpleclock.hpp"
+#endif
+#ifdef HAVE_SWAY
+#include "modules/sway/language.hpp"
+#include "modules/sway/mode.hpp"
+#include "modules/sway/scratchpad.hpp"
+#include "modules/sway/window.hpp"
+#include "modules/sway/workspaces.hpp"
+#endif
+#ifdef HAVE_WLR
+#include "modules/wlr/taskbar.hpp"
+#include "modules/wlr/workspace_manager.hpp"
+#endif
+#ifdef HAVE_RIVER
+#include "modules/river/layout.hpp"
+#include "modules/river/mode.hpp"
+#include "modules/river/tags.hpp"
+#include "modules/river/window.hpp"
+#endif
+#ifdef HAVE_DWL
+#include "modules/dwl/tags.hpp"
+#endif
+#ifdef HAVE_HYPRLAND
+#include "modules/hyprland/backend.hpp"
+#include "modules/hyprland/language.hpp"
+#include "modules/hyprland/submap.hpp"
+#include "modules/hyprland/window.hpp"
+#include "modules/hyprland/workspaces.hpp"
+#endif
+#if defined(__FreeBSD__) || (defined(__linux__) && !defined(NO_FILESYSTEM))
+#include "modules/battery.hpp"
+#endif
+#if defined(HAVE_CPU_LINUX) || defined(HAVE_CPU_BSD)
+#include "modules/cpu.hpp"
+#include "modules/cpu_frequency.hpp"
+#include "modules/cpu_usage.hpp"
+#include "modules/load.hpp"
+#endif
+#include "modules/idle_inhibitor.hpp"
+#if defined(HAVE_MEMORY_LINUX) || defined(HAVE_MEMORY_BSD)
+#include "modules/memory.hpp"
+#endif
+#include "modules/disk.hpp"
+#ifdef HAVE_DBUSMENU
+#include "modules/sni/tray.hpp"
+#endif
+#ifdef HAVE_MPRIS
+#include "modules/mpris/mpris.hpp"
+#endif
+#ifdef HAVE_LIBNL
+#include "modules/network.hpp"
+#endif
+#ifdef HAVE_LIBUDEV
+#include "modules/backlight.hpp"
+#endif
+#ifdef HAVE_LIBEVDEV
+#include "modules/keyboard_state.hpp"
+#endif
+#ifdef HAVE_GAMEMODE
+#include "modules/gamemode.hpp"
+#endif
+#ifdef HAVE_UPOWER
+#include "modules/upower/upower.hpp"
+#endif
+#ifdef HAVE_PIPEWIRE
+#include "modules/privacy/privacy.hpp"
+#endif
+#ifdef HAVE_LIBPULSE
+#include "modules/pulseaudio.hpp"
+#endif
+#ifdef HAVE_LIBMPDCLIENT
+#include "modules/mpd/mpd.hpp"
+#endif
+#ifdef HAVE_LIBSNDIO
+#include "modules/sndio.hpp"
+#endif
+#ifdef HAVE_GIO_UNIX
+#include "modules/bluetooth.hpp"
+#include "modules/inhibitor.hpp"
+#endif
+#ifdef HAVE_LIBJACK
+#include "modules/jack.hpp"
+#endif
+#ifdef HAVE_LIBWIREPLUMBER
+#include "modules/wireplumber.hpp"
+#endif
+#ifdef HAVE_LIBCAVA
+#include "modules/cava.hpp"
+#endif
+#ifdef HAVE_SYSTEMD_MONITOR
+#include "modules/systemd_failed_units.hpp"
+#endif
+#include "bar.hpp"
+#include "modules/cffi.hpp"
+#include "modules/custom.hpp"
+#include "modules/image.hpp"
+#include "modules/temperature.hpp"
+#include "modules/user.hpp"

 namespace waybar {

-class Bar;
-
 class Factory {
 public:
  Factory(const Bar& bar, const Json::Value& config);
--- a/include/group.hpp
+++ b/include/group.hpp
@@ -11,13 +11,15 @@ namespace waybar {

 class Group : public AModule {
 public:
-  Group(const std::string &, const std::string &, const Json::Value &, bool);
-  ~Group() override = default;
+  Group(const std::string&, const std::string&, const Json::Value&, bool);
+  virtual ~Group() = default;
  auto update() -> void override;
-  operator Gtk::Widget &() override;
+  operator Gtk::Widget&() override;

-  virtual Gtk::Box &getBox();
-  void addWidget(Gtk::Widget &widget);
+  virtual Gtk::Box& getBox();
+  void addWidget(Gtk::Widget& widget);
+
+//  bool handleMouseHover(GdkEventCrossing* const& e);

 protected:
  Gtk::Box box;
@@ -25,13 +27,9 @@ class Group : public AModule {
  Gtk::Revealer revealer;
  bool is_first_widget = true;
  bool is_drawer = false;
-  bool click_to_reveal = false;
  std::string add_class_to_drawer_children;
-  bool handleMouseEnter(GdkEventCrossing *const &ev) override;
-  bool handleMouseLeave(GdkEventCrossing *const &ev) override;
-  bool handleToggle(GdkEventButton *const &ev) override;
-  void show_group();
-  void hide_group();
+
+  void addHoverHandlerTo(Gtk::Widget& widget);
 };

 }  // namespace waybar
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -1,12 +1,14 @@
 #pragma once

-#include <fmt/format.h>
-
+#ifdef FILESYSTEM_EXPERIMENTAL
+#include <experimental/filesystem>
+#else
 #include <filesystem>
+#endif
+#include <fmt/format.h>
 #if defined(__linux__)
 #include <sys/inotify.h>
 #endif
-#include <sys/poll.h>

 #include <algorithm>
 #include <fstream>
@@ -14,17 +16,19 @@
 #include <vector>

 #include "ALabel.hpp"
-#include "bar.hpp"
 #include "util/sleeper_thread.hpp"
-#include "util/udev_deleter.hpp"

 namespace waybar::modules {

+#ifdef FILESYSTEM_EXPERIMENTAL
+namespace fs = std::experimental::filesystem;
+#else
 namespace fs = std::filesystem;
+#endif

 class Battery : public ALabel {
 public:
-  Battery(const std::string&, const waybar::Bar&, const Json::Value&);
+  Battery(const std::string&, const Json::Value&);
  virtual ~Battery();
  auto update() -> void override;

@@ -34,23 +38,17 @@ class Battery : public ALabel {
  void refreshBatteries();
  void worker();
  const std::string getAdapterStatus(uint8_t capacity) const;
-  std::tuple<uint8_t, float, std::string, float, uint16_t, float> getInfos();
+  const std::tuple<uint8_t, float, std::string, float> getInfos();
  const std::string formatTimeRemaining(float hoursRemaining);
-  void setBarClass(std::string&);
-  void processEvents(std::string& state, std::string& status, uint8_t capacity);

+  int global_watch;
  std::map<fs::path, int> batteries_;
-  std::unique_ptr<udev, util::UdevDeleter> udev_;
-  std::array<pollfd, 1> poll_fds_;
-  std::unique_ptr<udev_monitor, util::UdevMonitorDeleter> mon_;
  fs::path adapter_;
  int battery_watch_fd_;
+  int global_watch_fd_;
  std::mutex battery_list_mutex_;
  std::string old_status_;
-  std::string last_event_;
  bool warnFirstTime_{true};
-  bool weightedAverage_{true};
-  const Bar& bar_;

  util::SleeperThread thread_;
  util::SleeperThread thread_battery_update_;
--- a/include/modules/bluetooth.hpp
+++ b/include/modules/bluetooth.hpp
@@ -49,9 +49,6 @@ class Bluetooth : public ALabel {
  auto update() -> void override;

 private:
-  static auto onObjectAdded(GDBusObjectManager*, GDBusObject*, gpointer) -> void;
-  static auto onObjectRemoved(GDBusObjectManager*, GDBusObject*, gpointer) -> void;
-
  static auto onInterfaceAddedOrRemoved(GDBusObjectManager*, GDBusObject*, GDBusInterface*,
                                        gpointer) -> void;
  static auto onInterfaceProxyPropertiesChanged(GDBusObjectManagerClient*, GDBusObjectProxy*,
--- a/include/modules/cava.hpp
+++ b/include/modules/cava.hpp
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "ALabel.hpp"
+#include "util/sleeper_thread.hpp"
+
+namespace cava {
+extern "C" {
+#include <cava/common.h>
+}
+}  // namespace cava
+
+namespace waybar::modules {
+using namespace std::literals::chrono_literals;
+
+class Cava final : public ALabel {
+ public:
+  Cava(const std::string&, const Json::Value&);
+  virtual ~Cava();
+  auto update() -> void override;
+  auto doAction(const std::string& name) -> void override;
+
+ private:
+  util::SleeperThread thread_;
+  util::SleeperThread thread_fetch_input_;
+
+  struct cava::error_s error_ {};          // cava errors
+  struct cava::config_params prm_ {};      // cava parameters
+  struct cava::audio_raw audio_raw_ {};    // cava handled raw audio data(is based on audio_data)
+  struct cava::audio_data audio_data_ {};  // cava audio data
+  struct cava::cava_plan* plan_;           //{new cava_plan{}};
+  // Cava API to read audio source
+  cava::ptr input_source_;
+  // Delay to handle audio source
+  std::chrono::milliseconds frame_time_milsec_{1s};
+  // Text to display
+  std::string text_{""};
+  int rePaint_{1};
+  std::chrono::seconds fetch_input_delay_{4};
+  std::chrono::seconds suspend_silence_delay_{0};
+  bool silence_{false};
+  bool hide_on_silence_{false};
+  int sleep_counter_{0};
+  // Cava method
+  void pause_resume();
+  // ModuleActionMap
+  static inline std::map<const std::string, void (waybar::modules::Cava::*const)()> actionMap_{
+      {"mode", &waybar::modules::Cava::pause_resume}};
+};
+}  // namespace waybar::modules
--- a/include/modules/cava/cavaGLSL.hpp
+++ b/include/modules/cava/cavaGLSL.hpp
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <epoxy/gl.h>
-
-#include "AModule.hpp"
-#include "cava_backend.hpp"
-
-namespace waybar::modules::cava {
-
-class CavaGLSL final : public AModule, public Gtk::GLArea {
- public:
-  CavaGLSL(const std::string&, const Json::Value&);
-  ~CavaGLSL() = default;
-
- private:
-  std::shared_ptr<CavaBackend> backend_;
-  struct ::cava::config_params prm_;
-  int frame_counter{0};
-  bool silence_{false};
-  bool hide_on_silence_{false};
-  // Cava method
-  auto onUpdate(const ::cava::audio_raw& input) -> void;
-  auto onSilence() -> void;
-  // Member variable to store the shared pointer
-  std::shared_ptr<::cava::audio_raw> m_data_;
-  GLuint shaderProgram_;
-  // OpenGL variables
-  GLuint fbo_;
-  GLuint texture_;
-  GLint uniform_bars_;
-  GLint uniform_previous_bars_;
-  GLint uniform_bars_count_;
-  GLint uniform_time_;
-  // Methods
-  void onRealize();
-  bool onRender(const Glib::RefPtr<Gdk::GLContext>& context);
-
-  void initShaders();
-  void initSurface();
-  void initGLSL();
-  GLuint loadShader(const std::string& fileName, GLenum type);
-};
-}  // namespace waybar::modules::cava
--- a/include/modules/cava/cavaRaw.hpp
+++ b/include/modules/cava/cavaRaw.hpp
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "ALabel.hpp"
-#include "cava_backend.hpp"
-
-namespace waybar::modules::cava {
-
-class Cava final : public ALabel, public sigc::trackable {
- public:
-  Cava(const std::string&, const Json::Value&);
-  ~Cava() = default;
-  auto doAction(const std::string& name) -> void override;
-
- private:
-  std::shared_ptr<CavaBackend> backend_;
-  // Text to display
-  Glib::ustring label_text_{""};
-  bool silence_{false};
-  bool hide_on_silence_{false};
-  std::string format_silent_{""};
-  int ascii_range_{0};
-  // Cava method
-  void pause_resume();
-  auto onUpdate(const std::string& input) -> void;
-  auto onSilence() -> void;
-  // ModuleActionMap
-  static inline std::map<const std::string, void (waybar::modules::cava::Cava::* const)()>
-      actionMap_{{"mode", &waybar::modules::cava::Cava::pause_resume}};
-};
-}  // namespace waybar::modules::cava
--- a/include/modules/cava/cava_backend.hpp
+++ b/include/modules/cava/cava_backend.hpp
@@ -1,84 +0,0 @@
-#pragma once
-
-#include <json/json.h>
-#include <sigc++/sigc++.h>
-
-#include "util/sleeper_thread.hpp"
-
-namespace cava {
-extern "C" {
-// Need sdl_glsl output feature to be enabled on libcava
-#ifndef SDL_GLSL
-#define SDL_GLSL
-#endif
-
-#include <cava/common.h>
-
-#ifdef SDL_GLSL
-#undef SDL_GLSL
-#endif
-}
-}  // namespace cava
-
-namespace waybar::modules::cava {
-using namespace std::literals::chrono_literals;
-
-class CavaBackend final {
- public:
-  static std::shared_ptr<CavaBackend> inst(const Json::Value& config);
-
-  virtual ~CavaBackend();
-  // Methods
-  int getAsciiRange();
-  void doPauseResume();
-  void Update();
-  const struct ::cava::config_params* getPrm();
-  std::chrono::milliseconds getFrameTimeMilsec();
-
-  // Signal accessor
-  using type_signal_update = sigc::signal<void(const std::string&)>;
-  type_signal_update signal_update();
-  using type_signal_audio_raw_update = sigc::signal<void(const ::cava::audio_raw&)>;
-  type_signal_audio_raw_update signal_audio_raw_update();
-  using type_signal_silence = sigc::signal<void()>;
-  type_signal_silence signal_silence();
-
- private:
-  CavaBackend(const Json::Value& config);
-  util::SleeperThread read_thread_;
-  util::SleeperThread out_thread_;
-
-  // Cava API to read audio source
-  ::cava::ptr input_source_{NULL};
-
-  struct ::cava::error_s error_{};          // cava errors
-  struct ::cava::config_params prm_{};      // cava parameters
-  struct ::cava::audio_raw audio_raw_{};    // cava handled raw audio data(is based on audio_data)
-  struct ::cava::audio_data audio_data_{};  // cava audio data
-  struct ::cava::cava_plan* plan_{NULL};    //{new cava_plan{}};
-
-  std::chrono::seconds fetch_input_delay_{4};
-  // Delay to handle audio source
-  std::chrono::milliseconds frame_time_milsec_{1s};
-
-  const Json::Value& config_;
-  int re_paint_{0};
-  bool silence_{false};
-  bool silence_prev_{false};
-  std::chrono::seconds suspend_silence_delay_{0};
-  int sleep_counter_{0};
-  std::string output_{};
-  // Methods
-  void invoke();
-  void execute();
-  bool isSilence();
-  void doUpdate(bool force = false);
-  void loadConfig();
-  void freeBackend();
-
-  // Signal
-  type_signal_update m_signal_update_;
-  type_signal_audio_raw_update m_signal_audio_raw_;
-  type_signal_silence m_signal_silence_;
-};
-}  // namespace waybar::modules::cava
--- a/include/modules/cava/cava_frontend.hpp
+++ b/include/modules/cava/cava_frontend.hpp
@@ -1,27 +0,0 @@
-#pragma once
-
-#ifdef HAVE_LIBCAVA
-#include "cavaRaw.hpp"
-#include "cava_backend.hpp"
-#ifdef HAVE_LIBCAVAGLSL
-#include "cavaGLSL.hpp"
-#endif
-#endif
-
-namespace waybar::modules::cava {
-AModule* getModule(const std::string& id, const Json::Value& config) {
-#ifdef HAVE_LIBCAVA
-  const std::shared_ptr<CavaBackend> backend_{waybar::modules::cava::CavaBackend::inst(config)};
-  switch (backend_->getPrm()->output) {
-#ifdef HAVE_LIBCAVAGLSL
-    case ::cava::output_method::OUTPUT_SDL_GLSL:
-      return new waybar::modules::cava::CavaGLSL(id, config);
-#endif
-    default:
-      return new waybar::modules::cava::Cava(id, config);
-  }
-#else
-  throw std::runtime_error("Unknown module");
-#endif
-};
-}  // namespace waybar::modules::cava
--- a/include/modules/cffi.hpp
+++ b/include/modules/cffi.hpp
@@ -16,7 +16,7 @@ typedef struct wbcffi_module wbcffi_module;
 typedef struct {
  wbcffi_module* obj;
  const char* waybar_version;
-  GtkContainer* (*get_root_widget)(wbcffi_module*);
+//todo  GtkContainer* (*get_root_widget)(wbcffi_module*);
  void (*queue_update)(wbcffi_module*);
 } wbcffi_init_info;

--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -8,7 +8,6 @@ namespace waybar::modules {

 const std::string kCldPlaceholder{"calendar"};
 const std::string kTZPlaceholder{"tz_list"};
-const std::string kOrdPlaceholder{"ordinal_date"};

 enum class CldMode { MONTH, YEAR };
 enum class WS { LEFT, RIGHT, HIDDEN };
@@ -21,12 +20,10 @@ class Clock final : public ALabel {
  auto doAction(const std::string&) -> void override;

 private:
-  const std::locale m_locale_;
+  const std::locale locale_;
  // tooltip
-  const std::string m_tlpFmt_;
-  std::string m_tlpText_{""};                 // tooltip text to print
-  const Glib::RefPtr<Gtk::Label> m_tooltip_;  // tooltip as a separate Gtk::Label
-  bool query_tlp_cb(int, int, bool, const Glib::RefPtr<Gtk::Tooltip>& tooltip);
+  const std::string tlpFmt_;
+  std::string tlpText_{""};  // tooltip text to print
  // Calendar
  const bool cldInTooltip_;  // calendar in tooltip
  /*
@@ -38,54 +35,41 @@ class Clock final : public ALabel {
    5 - tooltip-format
   */
  std::map<int, std::string const> fmtMap_;
-  uint cldMonCols_{3};                 // calendar count month columns
-  int cldWnLen_{3};                    // calendar week number length
-  const int cldMonColLen_{20};         // calendar month column length
-  WS cldWPos_{WS::HIDDEN};             // calendar week side to print
-  date::months cldCurrShift_{0};       // calendar months shift
-  int cldShift_{1};                    // calendar months shift factor
-  date::year_month_day cldYearShift_;  // calendar Year mode. Cached ymd
-  std::string cldYearCached_;          // calendar Year mode. Cached calendar
-  date::year_month cldMonShift_;       // calendar Month mode. Cached ym
-  std::string cldMonCached_;           // calendar Month mode. Cached calendar
-  date::day cldBaseDay_{0};      // calendar Cached day. Is used when today is changing(midnight)
+  uint cldMonCols_{3};           // calendar count month columns
+  int cldWnLen_{3};              // calendar week number length
+  const int cldMonColLen_{20};   // calendar month column length
+  WS cldWPos_{WS::HIDDEN};       // calendar week side to print
+  months cldCurrShift_{0};       // calendar months shift
+  year_month_day cldYearShift_;  // calendar Year mode. Cached ymd
+  std::string cldYearCached_;    // calendar Year mode. Cached calendar
+  year_month cldMonShift_;       // calendar Month mode. Cached ym
+  std::string cldMonCached_;     // calendar Month mode. Cached calendar
+  day cldBaseDay_{0};            // calendar Cached day. Is used when today is changing(midnight)
  std::string cldText_{""};      // calendar text to print
-  bool iso8601Calendar_{false};  // whether the calendar is in ISO8601
  CldMode cldMode_{CldMode::MONTH};
-  auto get_calendar(const date::year_month_day& today, const date::year_month_day& ymd,
-                    const date::time_zone* tz) -> const std::string;
-
-  // get local time zone
-  auto local_zone() -> const date::time_zone*;
+  auto get_calendar(const year_month_day& today, const year_month_day& ymd, const time_zone* tz)
+      -> const std::string;

  // time zoned time in tooltip
-  const bool tzInTooltip_;                      // if need to print time zones text
-  std::vector<const date::time_zone*> tzList_;  // time zones list
-  int tzCurrIdx_;                               // current time zone index for tzList_
-  std::string tzText_{""};                      // time zones text to print
-  std::string tzTooltipFormat_{""};             // optional timezone tooltip format
+  const bool tzInTooltip_;                // if need to print time zones text
+  std::vector<const time_zone*> tzList_;  // time zones list
+  int tzCurrIdx_;                         // current time zone index for tzList_
+  std::string tzText_{""};                // time zones text to print
  util::SleeperThread thread_;

-  // ordinal date in tooltip
-  const bool ordInTooltip_;
-  std::string ordText_{""};
-  auto get_ordinal_date(const date::year_month_day& today) -> std::string;
-
-  auto getTZtext(date::sys_seconds now) -> std::string;
-  auto first_day_of_week() -> date::weekday;
+  auto getTZtext(sys_seconds now) -> std::string;
+  auto first_day_of_week() -> weekday;
  // Module actions
  void cldModeSwitch();
  void cldShift_up();
  void cldShift_down();
-  void cldShift_reset();
  void tz_up();
  void tz_down();
  // Module Action Map
-  static inline std::map<const std::string, void (waybar::modules::Clock::* const)()> actionMap_{
+  static inline std::map<const std::string, void (waybar::modules::Clock::*const)()> actionMap_{
      {"mode", &waybar::modules::Clock::cldModeSwitch},
      {"shift_up", &waybar::modules::Clock::cldShift_up},
      {"shift_down", &waybar::modules::Clock::cldShift_down},
-      {"shift_reset", &waybar::modules::Clock::cldShift_reset},
      {"tz_up", &waybar::modules::Clock::tz_up},
      {"tz_down", &waybar::modules::Clock::tz_down}};
 };
--- a/include/modules/custom.hpp
+++ b/include/modules/custom.hpp
@@ -26,8 +26,8 @@ class Custom : public ALabel {
  void parseOutputRaw();
  void parseOutputJson();
  void handleEvent();
-  bool handleScroll(GdkEventScroll* e) override;
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleScroll(GdkEventScroll* e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;

  const std::string name_;
  const std::string output_name_;
@@ -35,7 +35,6 @@ class Custom : public ALabel {
  std::string id_;
  std::string alt_;
  std::string tooltip_;
-  const bool tooltip_format_enabled_;
  std::vector<std::string> class_;
  int percentage_;
  FILE* fp_;
--- a/include/modules/dwl/window.hpp
+++ b/include/modules/dwl/window.hpp
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-
-#include <string>
-
-#include "AAppIconLabel.hpp"
-#include "bar.hpp"
-#include "dwl-ipc-unstable-v2-client-protocol.h"
-#include "util/json.hpp"
-
-namespace waybar::modules::dwl {
-
-class Window : public AAppIconLabel, public sigc::trackable {
- public:
-  Window(const std::string &, const waybar::Bar &, const Json::Value &);
-  ~Window();
-
-  void handle_layout(const uint32_t layout);
-  void handle_title(const char *title);
-  void handle_appid(const char *ppid);
-  void handle_layout_symbol(const char *layout_symbol);
-  void handle_frame();
-
-  struct zdwl_ipc_manager_v2 *status_manager_;
-
- private:
-  const Bar &bar_;
-
-  std::string title_;
-  std::string appid_;
-  std::string layout_symbol_;
-  uint32_t layout_;
-
-  struct zdwl_ipc_output_v2 *output_status_;
-};
-
-}  // namespace waybar::modules::dwl
--- a/include/modules/ext/workspace_manager.hpp
+++ b/include/modules/ext/workspace_manager.hpp
@@ -1,141 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-#include <gtkmm/button.h>
-#include <gtkmm/image.h>
-#include <gtkmm/label.h>
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "ext-workspace-v1-client-protocol.h"
-
-namespace waybar::modules::ext {
-
-class WorkspaceGroup;
-class Workspace;
-
-class WorkspaceManager final : public AModule {
- public:
-  WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config);
-  ~WorkspaceManager() override;
-  void register_manager(wl_registry *registry, uint32_t name, uint32_t version);
-  void remove_workspace_group(uint32_t id);
-  void remove_workspace(uint32_t id);
-  void set_needs_sorting() { needs_sorting_ = true; }
-
-  // wl events
-  void handle_workspace_group(ext_workspace_group_handle_v1 *handle);
-  void handle_workspace(ext_workspace_handle_v1 *handle);
-  void handle_done();
-  void handle_finished();
-
-  // wl requests
-  void commit() const;
-
- private:
-  void update() override;
-  bool has_button(const Gtk::Button *button);
-  void sort_workspaces();
-  void clear_buttons();
-  void update_buttons();
-
-  static uint32_t group_global_id;
-  static uint32_t workspace_global_id;
-  uint32_t workspace_name = 0;
-
-  bool sort_by_id_ = false;
-  bool sort_by_name_ = true;
-  bool sort_by_coordinates_ = false;
-  bool all_outputs_ = false;
-
-  const waybar::Bar &bar_;
-  Gtk::Box box_;
-
-  ext_workspace_manager_v1 *ext_manager_ = nullptr;
-  std::vector<std::unique_ptr<WorkspaceGroup>> groups_;
-  std::vector<std::unique_ptr<Workspace>> workspaces_;
-
-  bool needs_sorting_ = false;
-};
-
-class WorkspaceGroup {
- public:
-  WorkspaceGroup(WorkspaceManager &manager, ext_workspace_group_handle_v1 *handle, uint32_t id);
-  ~WorkspaceGroup();
-
-  u_int32_t id() const { return id_; }
-  bool has_output(const wl_output *output);
-  bool has_workspace(const ext_workspace_handle_v1 *workspace);
-
-  // wl events
-  void handle_capabilities(uint32_t capabilities);
-  void handle_output_enter(wl_output *output);
-  void handle_output_leave(wl_output *output);
-  void handle_workspace_enter(ext_workspace_handle_v1 *handle);
-  void handle_workspace_leave(ext_workspace_handle_v1 *handle);
-  void handle_removed();
-
- private:
-  WorkspaceManager &workspaces_manager_;
-  ext_workspace_group_handle_v1 *ext_handle_;
-  uint32_t id_;
-  std::vector<wl_output *> outputs_;
-  std::vector<ext_workspace_handle_v1 *> workspaces_;
-};
-
-class Workspace {
- public:
-  Workspace(const Json::Value &config, WorkspaceManager &manager, ext_workspace_handle_v1 *handle,
-            uint32_t id, const std::string &name);
-  ~Workspace();
-
-  ext_workspace_handle_v1 *handle() const { return ext_handle_; }
-  u_int32_t id() const { return id_; }
-  std::string &workspace_id() { return workspace_id_; }
-  std::string &name() { return name_; }
-  std::vector<u_int32_t> &coordinates() { return coordinates_; }
-  Gtk::Button &button() { return button_; }
-  void update();
-
-  // wl events
-  void handle_id(const std::string &id);
-  void handle_name(const std::string &name);
-  void handle_coordinates(const std::vector<uint32_t> &coordinates);
-  void handle_state(uint32_t state);
-  void handle_capabilities(uint32_t capabilities);
-  void handle_removed();
-
-  // gdk events
-  bool handle_clicked(const GdkEventButton *button) const;
-
- private:
-  bool has_state(uint32_t state) const { return (state_ & state) == state; }
-  std::string icon();
-
-  WorkspaceManager &workspace_manager_;
-  ext_workspace_handle_v1 *ext_handle_ = nullptr;
-  uint32_t id_;
-  uint32_t state_ = 0;
-  std::string workspace_id_;
-  std::string name_;
-  std::vector<uint32_t> coordinates_;
-
-  bool active_only_ = false;
-  bool ignore_hidden_ = true;
-  std::string format_;
-  bool with_icon_ = false;
-  static std::map<std::string, std::string> icon_map_;
-  std::string on_click_action_;
-  std::string on_click_middle_action_;
-  std::string on_click_right_action_;
-
-  Gtk::Button button_;
-  Gtk::Box content_;
-  Gtk::Label label_;
-};
-
-}  // namespace waybar::modules::ext
--- a/include/modules/ext/workspace_manager_binding.hpp
+++ b/include/modules/ext/workspace_manager_binding.hpp
@@ -1,10 +0,0 @@
-#include "ext-workspace-v1-client-protocol.h"
-
-namespace waybar::modules::ext {
-void add_registry_listener(void *data);
-void add_workspace_listener(ext_workspace_handle_v1 *workspace_handle, void *data);
-void add_workspace_group_listener(ext_workspace_group_handle_v1 *workspace_group_handle,
-                                  void *data);
-ext_workspace_manager_v1 *workspace_manager_bind(wl_registry *registry, uint32_t name,
-                                                 uint32_t version, void *data);
-}  // namespace waybar::modules::ext
--- a/include/modules/gps.hpp
+++ b/include/modules/gps.hpp
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-#include <sys/statvfs.h>
-
-#ifdef WANT_RFKILL
-#include "util/rfkill.hpp"
-#endif
-
-#include <gps.h>
-
-#include "ALabel.hpp"
-#include "util/sleeper_thread.hpp"
-
-namespace waybar::modules {
-
-class Gps : public ALabel {
- public:
-  Gps(const std::string&, const Json::Value&);
-  virtual ~Gps();
-  auto update() -> void override;
-
- private:
-#ifdef WANT_RFKILL
-  util::Rfkill rfkill_;
-#endif
-  const std::string getFixModeName() const;
-  const std::string getFixModeString() const;
-
-  const std::string getFixStatusString() const;
-
-  util::SleeperThread thread_, gps_thread_;
-  gps_data_t gps_data_;
-  std::string state_;
-
-  bool hideDisconnected = true;
-  bool hideNoFix = false;
-};
-
-}  // namespace waybar::modules
--- a/include/modules/hyprland/backend.hpp
+++ b/include/modules/hyprland/backend.hpp
@@ -1,10 +1,9 @@
 #pragma once

-#include <filesystem>
 #include <list>
+#include <memory>
 #include <mutex>
 #include <string>
-#include <thread>
 #include <utility>

 #include "util/json.hpp"
@@ -17,36 +16,25 @@ class EventHandler {
  virtual ~EventHandler() = default;
 };

-/// If you want to use the Hyprland IPC, simply use IPC::inst() to get the singleton instance.
-/// Do not create multiple instances.
 class IPC {
- protected:
-  IPC();  // use IPC::inst() instead.
-
 public:
-  ~IPC();
-  static IPC& inst();
+  IPC() { startIPC(); }

-  void registerForIPC(const std::string& ev, EventHandler* ev_handler);
-  void unregisterForIPC(EventHandler* handler);
+  void registerForIPC(const std::string&, EventHandler*);
+  void unregisterForIPC(EventHandler*);

  static std::string getSocket1Reply(const std::string& rq);
  Json::Value getSocket1JsonReply(const std::string& rq);
-  static std::filesystem::path getSocketFolder(const char* instanceSig);
-
- protected:
-  static std::filesystem::path socketFolder_;

 private:
-  void socketListener();
+  void startIPC();
  void parseIPC(const std::string&);

-  std::thread ipcThread_;
-  std::mutex callbackMutex_;
-  util::JsonParser parser_;
-  std::list<std::pair<std::string, EventHandler*>> callbacks_;
-  int socketfd_;  // the hyprland socket file descriptor
-  pid_t socketOwnerPid_;
-  bool running_ = true;  // the ipcThread will stop running when this is false
+  std::mutex m_callbackMutex;
+  util::JsonParser m_parser;
+  std::list<std::pair<std::string, EventHandler*>> m_callbacks;
 };
+
+inline std::unique_ptr<IPC> gIPC;
+inline bool modulesReady = false;
 };  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/language.hpp
+++ b/include/modules/hyprland/language.hpp
@@ -30,15 +30,13 @@ class Language : public waybar::ALabel, public EventHandler {
    std::string short_description;
  };

-  static auto getLayout(const std::string&) -> Layout;
+  auto getLayout(const std::string&) -> Layout;

  std::mutex mutex_;
  const Bar& bar_;
  util::JsonParser parser_;

  Layout layout_;
-
-  IPC& m_ipc;
 };

 }  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/submap.hpp
+++ b/include/modules/hyprland/submap.hpp
@@ -14,22 +14,17 @@ namespace waybar::modules::hyprland {
 class Submap : public waybar::ALabel, public EventHandler {
 public:
  Submap(const std::string&, const waybar::Bar&, const Json::Value&);
-  ~Submap() override;
+  virtual ~Submap();

  auto update() -> void override;

 private:
-  auto parseConfig(const Json::Value&) -> void;
-  void onEvent(const std::string& ev) override;
+  void onEvent(const std::string&) override;

  std::mutex mutex_;
  const Bar& bar_;
  util::JsonParser parser_;
  std::string submap_;
-  bool always_on_ = false;
-  std::string default_submap_ = "Default";
-
-  IPC& m_ipc;
 };

 }  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/window.hpp
+++ b/include/modules/hyprland/window.hpp
@@ -25,7 +25,7 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
    std::string last_window;
    std::string last_window_title;

-    static auto parse(const Json::Value& value) -> Workspace;
+    static auto parse(const Json::Value&) -> Workspace;
  };

  struct WindowData {
@@ -41,27 +41,24 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
    static auto parse(const Json::Value&) -> WindowData;
  };

-  static auto getActiveWorkspace(const std::string&) -> Workspace;
-  static auto getActiveWorkspace() -> Workspace;
-  void onEvent(const std::string& ev) override;
+  auto getActiveWorkspace(const std::string&) -> Workspace;
+  auto getActiveWorkspace() -> Workspace;
+  void onEvent(const std::string&) override;
  void queryActiveWorkspace();
  void setClass(const std::string&, bool enable);

-  bool separateOutputs_;
+  bool separate_outputs;
  std::mutex mutex_;
  const Bar& bar_;
  util::JsonParser parser_;
-  WindowData windowData_;
+  WindowData window_data_;
  Workspace workspace_;
-  std::string soloClass_;
-  std::string lastSoloClass_;
+  std::string solo_class_;
+  std::string last_solo_class_;
  bool solo_;
-  bool allFloating_;
+  bool all_floating_;
  bool swallowing_;
  bool fullscreen_;
-  bool focused_;
-
-  IPC& m_ipc;
 };

 }  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/windowcount.hpp
+++ b/include/modules/hyprland/windowcount.hpp
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-
-#include <string>
-
-#include "AAppIconLabel.hpp"
-#include "bar.hpp"
-#include "modules/hyprland/backend.hpp"
-
-namespace waybar::modules::hyprland {
-
-class WindowCount : public waybar::AAppIconLabel, public EventHandler {
- public:
-  WindowCount(const std::string&, const waybar::Bar&, const Json::Value&);
-  ~WindowCount() override;
-
-  auto update() -> void override;
-
- private:
-  struct Workspace {
-    int id;
-    int windows;
-    bool hasfullscreen;
-    static auto parse(const Json::Value& value) -> Workspace;
-  };
-
-  auto getActiveWorkspace(const std::string&) -> Workspace;
-  auto getActiveWorkspace() -> Workspace;
-  void onEvent(const std::string& ev) override;
-  void queryActiveWorkspace();
-  void setClass(const std::string&, bool enable);
-
-  bool separateOutputs_;
-  std::mutex mutex_;
-  const Bar& bar_;
-  Workspace workspace_;
-  IPC& m_ipc;
-};
-
-}  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/windowcreationpayload.hpp
+++ b/include/modules/hyprland/windowcreationpayload.hpp
@@ -1,75 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <gtkmm/label.h>
-#include <json/value.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <optional>
-#include <regex>
-#include <string>
-#include <variant>
-#include <vector>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/hyprland/backend.hpp"
-#include "util/enum.hpp"
-#include "util/regex_collection.hpp"
-
-using WindowAddress = std::string;
-
-namespace waybar::modules::hyprland {
-
-class Workspaces;
-
-struct WindowRepr {
-  std::string address;
-  std::string window_class;
-  std::string window_title;
-  std::string repr_rewrite;
-  bool isActive = false;
-
- public:
-  bool empty() const { return address.empty(); }
-  void setActive(bool value) { isActive = value; }
-};
-
-class WindowCreationPayload {
- public:
-  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
-                        WindowRepr window_repr);
-  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
-                        std::string window_class, std::string window_title, bool is_active);
-  WindowCreationPayload(Json::Value const& client_data);
-
-  int incrementTimeSpentUncreated();
-  bool isEmpty(Workspaces& workspace_manager);
-  bool reprIsReady() const { return std::holds_alternative<Repr>(m_window); }
-  WindowRepr repr(Workspaces& workspace_manager);
-  void setActive(bool value) { m_isActive = value; }
-
-  std::string getWorkspaceName() const { return m_workspaceName; }
-  WindowAddress getAddress() const { return m_windowAddress; }
-
-  void moveToWorkspace(std::string& new_workspace_name);
-
- private:
-  void clearAddr();
-  void clearWorkspaceName();
-
-  using Repr = WindowRepr;
-  using ClassAndTitle = std::pair<std::string, std::string>;
-  std::variant<Repr, ClassAndTitle> m_window;
-
-  WindowAddress m_windowAddress;
-  std::string m_workspaceName;
-  bool m_isActive = false;
-
-  int m_timeSpentUncreated = 0;
-};
-
-}  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/workspace.hpp
+++ b/include/modules/hyprland/workspace.hpp
@@ -1,97 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <gtkmm/label.h>
-#include <json/value.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <optional>
-#include <regex>
-#include <string>
-#include <variant>
-#include <vector>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/hyprland/backend.hpp"
-#include "modules/hyprland/windowcreationpayload.hpp"
-#include "util/enum.hpp"
-#include "util/regex_collection.hpp"
-
-using WindowAddress = std::string;
-
-namespace waybar::modules::hyprland {
-
-class Workspaces;
-class Workspace {
- public:
-  explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
-                     const Json::Value& clients_data = Json::Value::nullRef);
-  std::string& selectIcon(std::map<std::string, std::string>& icons_map);
-  Gtk::Button& button() { return m_button; };
-
-  int id() const { return m_id; };
-  std::string name() const { return m_name; };
-  std::string output() const { return m_output; };
-  bool isActive() const { return m_isActive; };
-  bool isSpecial() const { return m_isSpecial; };
-  bool isPersistent() const { return m_isPersistentRule || m_isPersistentConfig; };
-  bool isPersistentConfig() const { return m_isPersistentConfig; };
-  bool isPersistentRule() const { return m_isPersistentRule; };
-  bool isVisible() const { return m_isVisible; };
-  bool isUrgent() const { return m_isUrgent; };
-
-  bool handleClicked(GdkEventButton* bt) const;
-  void setActive(bool value = true) { m_isActive = value; };
-  void setPersistentRule(bool value = true) { m_isPersistentRule = value; };
-  void setPersistentConfig(bool value = true) { m_isPersistentConfig = value; };
-  void setUrgent(bool value = true) { m_isUrgent = value; };
-  void setVisible(bool value = true) { m_isVisible = value; };
-  void setWindows(uint value) { m_windows = value; };
-  void setName(std::string const& value) { m_name = value; };
-  void setOutput(std::string const& value) { m_output = value; };
-  bool containsWindow(WindowAddress const& addr) const {
-    return std::ranges::any_of(m_windowMap,
-                               [&addr](const auto& window) { return window.address == addr; });
-  };
-  void insertWindow(WindowCreationPayload create_window_payload);
-  void initializeWindowMap(const Json::Value& clients_data);
-  void setActiveWindow(WindowAddress const& addr);
-
-  bool onWindowOpened(WindowCreationPayload const& create_window_payload);
-  std::optional<WindowRepr> closeWindow(WindowAddress const& addr);
-
-  void update(const std::string& workspace_icon);
-
- private:
-  Workspaces& m_workspaceManager;
-
-  int m_id;
-  std::string m_name;
-  std::string m_output;
-  uint m_windows;
-  bool m_isActive = false;
-  bool m_isSpecial = false;
-  bool m_isPersistentRule = false;    // represents the persistent state in hyprland
-  bool m_isPersistentConfig = false;  // represents the persistent state in the Waybar config
-  bool m_isUrgent = false;
-  bool m_isVisible = false;
-
-  std::vector<WindowRepr> m_windowMap;
-
-  Gtk::Button m_button;
-  Gtk::Box m_content;
-  Gtk::Label m_labelBefore;
-  Gtk::Label m_labelAfter;
-
-  bool isEmpty() const;
-  void updateTaskbar(const std::string& workspace_icon);
-  bool handleClick(const GdkEventButton* event_button, WindowAddress const& addr) const;
-  bool shouldSkipWindow(const WindowRepr& window_repr) const;
-  IPC& m_ipc;
-};
-
-}  // namespace waybar::modules::hyprland
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -1,25 +1,23 @@
 #pragma once

 #include <gtkmm/button.h>
-#include <gtkmm/enums.h>
 #include <gtkmm/label.h>
 #include <json/value.h>

+#include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
 #include <regex>
 #include <string>
+#include <variant>
 #include <vector>

 #include "AModule.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
-#include "modules/hyprland/windowcreationpayload.hpp"
-#include "modules/hyprland/workspace.hpp"
 #include "util/enum.hpp"
-#include "util/icon_loader.hpp"
 #include "util/regex_collection.hpp"

 using WindowAddress = std::string;
@@ -28,6 +26,92 @@ namespace waybar::modules::hyprland {

 class Workspaces;

+class WindowCreationPayload {
+ public:
+  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
+                        std::string window_repr);
+  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
+                        std::string window_class, std::string window_title);
+  WindowCreationPayload(Json::Value const& client_data);
+
+  int incrementTimeSpentUncreated();
+  bool isEmpty(Workspaces& workspace_manager);
+  bool reprIsReady() const { return std::holds_alternative<Repr>(m_window); }
+  std::string repr(Workspaces& workspace_manager);
+
+  std::string getWorkspaceName() const { return m_workspaceName; }
+  WindowAddress getAddress() const { return m_windowAddress; }
+
+  void moveToWorksace(std::string& new_workspace_name);
+
+ private:
+  void clearAddr();
+  void clearWorkspaceName();
+
+  using Repr = std::string;
+  using ClassAndTitle = std::pair<std::string, std::string>;
+  std::variant<Repr, ClassAndTitle> m_window;
+
+  WindowAddress m_windowAddress;
+  std::string m_workspaceName;
+
+  int m_timeSpentUncreated = 0;
+};
+
+class Workspace {
+ public:
+  explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
+                     const Json::Value& clients_data = Json::Value::nullRef);
+  std::string& selectIcon(std::map<std::string, std::string>& icons_map);
+  Gtk::Button& button() { return m_button; };
+
+  int id() const { return m_id; };
+  std::string name() const { return m_name; };
+  std::string output() const { return m_output; };
+  bool isActive() const { return m_active; };
+  bool isSpecial() const { return m_isSpecial; };
+  bool isPersistent() const { return m_isPersistent; };
+  bool isVisible() const { return m_isVisible; };
+  bool isEmpty() const { return m_windows == 0; };
+  bool isUrgent() const { return m_isUrgent; };
+
+  bool handleClicked(GdkEventButton* bt) const;
+  void setActive(bool value = true) { m_active = value; };
+  void setPersistent(bool value = true) { m_isPersistent = value; };
+  void setUrgent(bool value = true) { m_isUrgent = value; };
+  void setVisible(bool value = true) { m_isVisible = value; };
+  void setWindows(uint value) { m_windows = value; };
+  void setName(std::string const& value) { m_name = value; };
+  bool containsWindow(WindowAddress const& addr) const { return m_windowMap.contains(addr); }
+  void insertWindow(WindowCreationPayload create_window_paylod);
+  std::string removeWindow(WindowAddress const& addr);
+  void initializeWindowMap(const Json::Value& clients_data);
+
+  bool onWindowOpened(WindowCreationPayload const& create_window_paylod);
+  std::optional<std::string> closeWindow(WindowAddress const& addr);
+
+  void update(const std::string& format, const std::string& icon);
+
+ private:
+  Workspaces& m_workspaceManager;
+
+  int m_id;
+  std::string m_name;
+  std::string m_output;
+  uint m_windows;
+  bool m_active = false;
+  bool m_isSpecial = false;
+  bool m_isPersistent = false;
+  bool m_isUrgent = false;
+  bool m_isVisible = false;
+
+  std::map<WindowAddress, std::string> m_windowMap;
+
+  Gtk::Button m_button;
+  Gtk::Box m_content;
+  Gtk::Label m_label;
+};
+
 class Workspaces : public AModule, public EventHandler {
 public:
  Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
@@ -38,68 +122,33 @@ class Workspaces : public AModule, public EventHandler {
  auto allOutputs() const -> bool { return m_allOutputs; }
  auto showSpecial() const -> bool { return m_showSpecial; }
  auto activeOnly() const -> bool { return m_activeOnly; }
-  auto specialVisibleOnly() const -> bool { return m_specialVisibleOnly; }
-  auto persistentOnly() const -> bool { return m_persistentOnly; }
-  auto moveToMonitor() const -> bool { return m_moveToMonitor; }
-  auto enableTaskbar() const -> bool { return m_enableTaskbar; }
-  auto taskbarWithIcon() const -> bool { return m_taskbarWithIcon; }

  auto getBarOutput() const -> std::string { return m_bar.output->name; }
-  auto formatBefore() const -> std::string { return m_formatBefore; }
-  auto formatAfter() const -> std::string { return m_formatAfter; }
-  auto taskbarFormatBefore() const -> std::string { return m_taskbarFormatBefore; }
-  auto taskbarFormatAfter() const -> std::string { return m_taskbarFormatAfter; }
-  auto taskbarIconSize() const -> int { return m_taskbarIconSize; }
-  auto taskbarOrientation() const -> Gtk::Orientation { return m_taskbarOrientation; }
-  auto taskbarReverseDirection() const -> bool { return m_taskbarReverseDirection; }
-  auto onClickWindow() const -> std::string { return m_onClickWindow; }
-  auto getIgnoredWindows() const -> std::vector<std::regex> { return m_ignoreWindows; }
-
-  enum class ActiveWindowPosition { NONE, FIRST, LAST };
-  auto activeWindowPosition() const -> ActiveWindowPosition { return m_activeWindowPosition; }

  std::string getRewrite(std::string window_class, std::string window_title);
  std::string& getWindowSeparator() { return m_formatWindowSeparator; }
  bool isWorkspaceIgnored(std::string const& workspace_name);

  bool windowRewriteConfigUsesTitle() const { return m_anyWindowRewriteRuleUsesTitle; }
-  const IconLoader& iconLoader() const { return m_iconLoader; }

 private:
  void onEvent(const std::string& e) override;
  void updateWindowCount();
-  void sortSpecialCentered();
  void sortWorkspaces();
  void createWorkspace(Json::Value const& workspace_data,
                       Json::Value const& clients_data = Json::Value::nullRef);
-
-  static Json::Value createMonitorWorkspaceData(std::string const& name,
-                                                std::string const& monitor);
-  void removeWorkspace(std::string const& workspaceString);
+  void removeWorkspace(std::string const& name);
  void setUrgentWorkspace(std::string const& windowaddress);
-
-  // Config
  void parseConfig(const Json::Value& config);
-  auto populateIconsMap(const Json::Value& formatIcons) -> void;
-  static auto populateBoolConfig(const Json::Value& config, const std::string& key, bool& member)
-      -> void;
-  auto populateSortByConfig(const Json::Value& config) -> void;
-  auto populateIgnoreWorkspacesConfig(const Json::Value& config) -> void;
-  auto populateFormatWindowSeparatorConfig(const Json::Value& config) -> void;
-  auto populateWindowRewriteConfig(const Json::Value& config) -> void;
-  auto populateWorkspaceTaskbarConfig(const Json::Value& config) -> void;
-
  void registerIpc();

  // workspace events
  void onWorkspaceActivated(std::string const& payload);
-  void onSpecialWorkspaceActivated(std::string const& payload);
  void onWorkspaceDestroyed(std::string const& payload);
-  void onWorkspaceCreated(std::string const& payload,
+  void onWorkspaceCreated(std::string const& workspaceName,
                          Json::Value const& clientsData = Json::Value::nullRef);
  void onWorkspaceMoved(std::string const& payload);
  void onWorkspaceRenamed(std::string const& payload);
-  static std::optional<int> parseWorkspaceId(std::string const& workspaceIdStr);

  // monitor events
  void onMonitorFocused(std::string const& payload);
@@ -110,59 +159,37 @@ class Workspaces : public AModule, public EventHandler {
  void onWindowMoved(std::string const& payload);

  void onWindowTitleEvent(std::string const& payload);
-  void onActiveWindowChanged(WindowAddress const& payload);
-
-  void onConfigReloaded();

  int windowRewritePriorityFunction(std::string const& window_rule);

-  // event payload management
-  template <typename... Args>
-  static std::string makePayload(Args const&... args);
-  static std::pair<std::string, std::string> splitDoublePayload(std::string const& payload);
-  static std::tuple<std::string, std::string, std::string> splitTriplePayload(
-      std::string const& payload);
-
-  // Update methods
  void doUpdate();
-  void removeWorkspacesToRemove();
-  void createWorkspacesToCreate();
-  static std::vector<int> getVisibleWorkspaces();
-  void updateWorkspaceStates();
-  bool updateWindowsToCreate();

  void extendOrphans(int workspaceId, Json::Value const& clientsJson);
-  void registerOrphanWindow(WindowCreationPayload create_window_payload);
-
-  void initializeWorkspaces();
-  void setCurrentMonitorId();
-  void loadPersistentWorkspacesFromConfig(Json::Value const& clientsJson);
-  void loadPersistentWorkspacesFromWorkspaceRules(const Json::Value& clientsJson);
+  void registerOrphanWindow(WindowCreationPayload create_window_paylod);

  bool m_allOutputs = false;
  bool m_showSpecial = false;
  bool m_activeOnly = false;
-  bool m_specialVisibleOnly = false;
-  bool m_persistentOnly = false;
-  bool m_moveToMonitor = false;
-  Json::Value m_persistentWorkspaceConfig;

  // Map for windows stored in workspaces not present in the current bar.
  // This happens when the user has multiple monitors (hence, multiple bars)
-  // and doesn't share windows across bars (a.k.a `all-outputs` = false)
-  std::map<WindowAddress, WindowRepr, std::less<>> m_orphanWindowMap;
+  // and doesn't share windows accross bars (a.k.a `all-outputs` = false)
+  std::map<WindowAddress, std::string> m_orphanWindowMap;

-  enum class SortMethod { ID, NAME, NUMBER, SPECIAL_CENTERED, DEFAULT };
+  enum class SortMethod { ID, NAME, NUMBER, DEFAULT };
  util::EnumParser<SortMethod> m_enumParser;
  SortMethod m_sortBy = SortMethod::DEFAULT;
  std::map<std::string, SortMethod> m_sortMap = {{"ID", SortMethod::ID},
                                                 {"NAME", SortMethod::NAME},
                                                 {"NUMBER", SortMethod::NUMBER},
-                                                 {"SPECIAL-CENTERED", SortMethod::SPECIAL_CENTERED},
                                                 {"DEFAULT", SortMethod::DEFAULT}};

-  std::string m_formatBefore;
-  std::string m_formatAfter;
+  void fillPersistentWorkspaces();
+  void createPersistentWorkspaces();
+  std::vector<std::string> m_persistentWorkspacesToCreate;
+  bool m_persistentCreated = false;
+
+  std::string m_format;

  std::map<std::string, std::string> m_iconsMap;
  util::RegexCollection m_windowRewriteRules;
@@ -171,40 +198,17 @@ class Workspaces : public AModule, public EventHandler {

  bool m_withIcon;
  uint64_t m_monitorId;
-  int m_activeWorkspaceId;
-  std::string m_activeSpecialWorkspaceName;
+  std::string m_activeWorkspaceName;
  std::vector<std::unique_ptr<Workspace>> m_workspaces;
  std::vector<std::pair<Json::Value, Json::Value>> m_workspacesToCreate;
  std::vector<std::string> m_workspacesToRemove;
  std::vector<WindowCreationPayload> m_windowsToCreate;

-  IconLoader m_iconLoader;
-  bool m_enableTaskbar = false;
-  bool m_updateActiveWindow = false;
-  bool m_taskbarWithIcon = false;
-  bool m_taskbarWithTitle = false;
-  std::string m_taskbarFormatBefore;
-  std::string m_taskbarFormatAfter;
-  int m_taskbarIconSize = 16;
-  Gtk::Orientation m_taskbarOrientation = Gtk::ORIENTATION_HORIZONTAL;
-  bool m_taskbarReverseDirection = false;
-  util::EnumParser<ActiveWindowPosition> m_activeWindowEnumParser;
-  ActiveWindowPosition m_activeWindowPosition = ActiveWindowPosition::NONE;
-  std::map<std::string, ActiveWindowPosition> m_activeWindowPositionMap = {
-      {"NONE", ActiveWindowPosition::NONE},
-      {"FIRST", ActiveWindowPosition::FIRST},
-      {"LAST", ActiveWindowPosition::LAST},
-  };
-  std::string m_onClickWindow;
-  std::string m_currentActiveWindowAddress;
-
  std::vector<std::regex> m_ignoreWorkspaces;
-  std::vector<std::regex> m_ignoreWindows;

  std::mutex m_mutex;
  const Bar& m_bar;
  Gtk::Box m_box;
-  IPC& m_ipc;
 };

 }  // namespace waybar::modules::hyprland
--- a/include/modules/idle_inhibitor.hpp
+++ b/include/modules/idle_inhibitor.hpp
@@ -19,7 +19,7 @@ class IdleInhibitor : public ALabel {
  static bool status;

 private:
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;
  void toggleStatus();

  const Bar& bar_;
--- a/include/modules/image.hpp
+++ b/include/modules/image.hpp
@@ -31,7 +31,7 @@ class Image : public AModule {
  std::string path_;
  std::string tooltip_;
  int size_;
-  std::chrono::milliseconds interval_;
+  int interval_;
  util::command::res output_;

  util::SleeperThread thread_;
--- a/include/modules/mpd/state.hpp
+++ b/include/modules/mpd/state.hpp
@@ -148,7 +148,6 @@ class Stopped : public State {
 class Disconnected : public State {
  Context* const ctx_;
  sigc::connection timer_connection_;
-  int last_interval_;

 public:
  Disconnected(Context* const ctx) : ctx_{ctx} {}
@@ -163,7 +162,7 @@ class Disconnected : public State {
  Disconnected(Disconnected const&) = delete;
  Disconnected& operator=(Disconnected const&) = delete;

-  bool arm_timer(int interval) noexcept;
+  void arm_timer(int interval) noexcept;
  void disarm_timer() noexcept;

  bool on_timer();
--- a/include/modules/network.hpp
+++ b/include/modules/network.hpp
@@ -9,7 +9,6 @@
 #include <sys/epoll.h>

 #include <optional>
-#include <vector>

 #include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
@@ -17,8 +16,6 @@
 #include "util/rfkill.hpp"
 #endif

-enum ip_addr_pref : uint8_t { IPV4, IPV6, IPV4_6 };
-
 namespace waybar::modules {

 class Network : public ALabel {
@@ -28,8 +25,8 @@ class Network : public ALabel {
  auto update() -> void override;

 private:
-  static const uint8_t MAX_RETRY{5};
-  static const uint8_t EPOLL_MAX{200};
+  static const uint8_t MAX_RETRY = 5;
+  static const uint8_t EPOLL_MAX = 200;

  static int handleEvents(struct nl_msg*, void*);
  static int handleEventsDone(struct nl_msg*, void*);
@@ -43,46 +40,41 @@ class Network : public ALabel {
  void parseEssid(struct nlattr**);
  void parseSignal(struct nlattr**);
  void parseFreq(struct nlattr**);
-  void parseBssid(struct nlattr**);
  bool associatedOrJoined(struct nlattr**);
-  bool matchInterface(const std::string& ifname, const std::vector<std::string>& altnames,
-                      std::string& matched) const;
+  bool checkInterface(std::string name);
  auto getInfo() -> void;
  const std::string getNetworkState() const;
  void clearIface();
+  bool wildcardMatch(const std::string& pattern, const std::string& text) const;
  std::optional<std::pair<unsigned long long, unsigned long long>> readBandwidthUsage();

-  int ifid_{-1};
-  ip_addr_pref addr_pref_{ip_addr_pref::IPV4};
-  struct sockaddr_nl nladdr_{0};
-  struct nl_sock* sock_{nullptr};
-  struct nl_sock* ev_sock_{nullptr};
-  int efd_{-1};
-  int ev_fd_{-1};
-  int nl80211_id_{-1};
+  int ifid_;
+  sa_family_t family_;
+  struct sockaddr_nl nladdr_ = {0};
+  struct nl_sock* sock_ = nullptr;
+  struct nl_sock* ev_sock_ = nullptr;
+  int efd_;
+  int ev_fd_;
+  int nl80211_id_;
  std::mutex mutex_;

-  bool want_route_dump_{false};
-  bool want_link_dump_{false};
-  bool want_addr_dump_{false};
-  bool dump_in_progress_{false};
-  bool is_p2p_{false};
+  bool want_route_dump_;
+  bool want_link_dump_;
+  bool want_addr_dump_;
+  bool dump_in_progress_;
+  bool is_p2p_;

-  unsigned long long bandwidth_down_total_{0};
-  unsigned long long bandwidth_up_total_{0};
+  unsigned long long bandwidth_down_total_;
+  unsigned long long bandwidth_up_total_;

  std::string state_;
  std::string essid_;
-  std::string bssid_;
-  bool carrier_{false};
+  bool carrier_;
  std::string ifname_;
  std::string ipaddr_;
-  std::string ipaddr6_;
  std::string gwaddr_;
  std::string netmask_;
-  std::string netmask6_;
-  int cidr_{0};
-  int cidr6_{0};
+  int cidr_;
  int32_t signal_strength_dbm_;
  uint8_t signal_strength_;
  std::string signal_strength_app_;
@@ -91,9 +83,9 @@ class Network : public ALabel {
  util::SleeperThread thread_;
  util::SleeperThread thread_timer_;
 #ifdef WANT_RFKILL
-  util::Rfkill rfkill_{RFKILL_TYPE_WLAN};
+  util::Rfkill rfkill_;
 #endif
-  float frequency_{0};
+  float frequency_;
 };

 }  // namespace waybar::modules
--- a/include/modules/niri/backend.hpp
+++ b/include/modules/niri/backend.hpp
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <list>
-#include <mutex>
-#include <string>
-#include <utility>
-
-#include "util/json.hpp"
-
-namespace waybar::modules::niri {
-
-class EventHandler {
- public:
-  virtual void onEvent(const Json::Value& ev) = 0;
-  virtual ~EventHandler() = default;
-};
-
-class IPC {
- public:
-  IPC() { startIPC(); }
-
-  void registerForIPC(const std::string& ev, EventHandler* ev_handler);
-  void unregisterForIPC(EventHandler* handler);
-
-  static Json::Value send(const Json::Value& request);
-
-  // 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_; }
-  unsigned keyboardLayoutCurrent() const { return keyboardLayoutCurrent_; }
-
- private:
-  void startIPC();
-  static int connectToSocket();
-  void parseIPC(const std::string&);
-
-  std::mutex dataMutex_;
-  std::vector<Json::Value> workspaces_;
-  std::vector<Json::Value> windows_;
-  std::vector<std::string> keyboardLayoutNames_;
-  unsigned keyboardLayoutCurrent_;
-
-  util::JsonParser parser_;
-  std::mutex callbackMutex_;
-  std::list<std::pair<std::string, EventHandler*>> callbacks_;
-};
-
-inline std::unique_ptr<IPC> gIPC;
-
-};  // namespace waybar::modules::niri
--- a/include/modules/niri/language.hpp
+++ b/include/modules/niri/language.hpp
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "ALabel.hpp"
-#include "bar.hpp"
-#include "modules/niri/backend.hpp"
-
-namespace waybar::modules::niri {
-
-class Language : public ALabel, public EventHandler {
- public:
-  Language(const std::string &, const Bar &, const Json::Value &);
-  ~Language() override;
-  void update() override;
-
- private:
-  void updateFromIPC();
-  void onEvent(const Json::Value &ev) override;
-  void doUpdate();
-
-  struct Layout {
-    std::string full_name;
-    std::string short_name;
-    std::string variant;
-    std::string short_description;
-  };
-
-  static Layout getLayout(const std::string &fullName);
-
-  std::mutex mutex_;
-  const Bar &bar_;
-
-  std::vector<Layout> layouts_;
-  unsigned current_idx_;
-  std::string last_short_name_;
-};
-
-}  // namespace waybar::modules::niri
--- a/include/modules/niri/window.hpp
+++ b/include/modules/niri/window.hpp
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <json/value.h>
-
-#include "AAppIconLabel.hpp"
-#include "bar.hpp"
-#include "modules/niri/backend.hpp"
-
-namespace waybar::modules::niri {
-
-class Window : public AAppIconLabel, public EventHandler {
- public:
-  Window(const std::string &, const Bar &, const Json::Value &);
-  ~Window() override;
-  void update() override;
-
- private:
-  void onEvent(const Json::Value &ev) override;
-  void doUpdate();
-  void setClass(const std::string &className, bool enable);
-
-  const Bar &bar_;
-
-  std::string oldAppId_;
-};
-
-}  // namespace waybar::modules::niri
--- a/include/modules/niri/workspaces.hpp
+++ b/include/modules/niri/workspaces.hpp
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <json/value.h>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/niri/backend.hpp"
-
-namespace waybar::modules::niri {
-
-class Workspaces : public AModule, public EventHandler {
- public:
-  Workspaces(const std::string &, const Bar &, const Json::Value &);
-  ~Workspaces() override;
-  void update() override;
-
- private:
-  void onEvent(const Json::Value &ev) override;
-  void doUpdate();
-  Gtk::Button &addButton(const Json::Value &ws);
-  std::string getIcon(const std::string &value, const Json::Value &ws);
-
-  const Bar &bar_;
-  Gtk::Box box_;
-  // Map from niri workspace id to button.
-  std::unordered_map<uint64_t, Gtk::Button> buttons_;
-};
-
-}  // namespace waybar::modules::niri
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-
-#include "ALabel.hpp"
-#include "giomm/dbusproxy.h"
-
-namespace waybar::modules {
-
-struct Profile {
-  std::string name;
-  std::string driver;
-
-  Profile(std::string n, std::string d) : name(std::move(n)), driver(std::move(d)) {}
-};
-
-class PowerProfilesDaemon : public ALabel {
- public:
-  PowerProfilesDaemon(const std::string &, const Json::Value &);
-  auto update() -> void override;
-  void profileChangedCb(const Gio::DBus::Proxy::MapChangedProperties &,
-                        const std::vector<Glib::ustring> &);
-  void busConnectedCb(Glib::RefPtr<Gio::AsyncResult> &r);
-  void getAllPropsCb(Glib::RefPtr<Gio::AsyncResult> &r);
-  void setPropCb(Glib::RefPtr<Gio::AsyncResult> &r);
-  void populateInitState();
-  bool handleToggle(GdkEventButton *const &e) override;
-
- private:
-  // True if we're connected to the dbug interface. False if we're
-  // not.
-  bool connected_;
-  // Look for a profile name in the list of available profiles and
-  // switch activeProfile_ to it.
-  void switchToProfile(std::string const &);
-  // Used to toggle/display the profiles
-  std::vector<Profile> availableProfiles_;
-  // Points to the active profile in the profiles list
-  std::vector<Profile>::iterator activeProfile_;
-  // Current CSS class applied to the label
-  std::string currentStyle_;
-  // Format string
-  std::string tooltipFormat_;
-  // DBus Proxy used to track the current active profile
-  Glib::RefPtr<Gio::DBus::Proxy> powerProfilesProxy_;
-};
-
-}  // namespace waybar::modules
--- a/include/modules/privacy/privacy.hpp
+++ b/include/modules/privacy/privacy.hpp
@@ -1,7 +1,10 @@
 #pragma once

+#include <iostream>
+#include <map>
 #include <string>

+#include "ALabel.hpp"
 #include "gtkmm/box.h"
 #include "modules/privacy/privacy_item.hpp"
 #include "util/pipewire/pipewire_backend.hpp"
@@ -13,7 +16,7 @@ namespace waybar::modules::privacy {

 class Privacy : public AModule {
 public:
-  Privacy(const std::string &, const Json::Value &, Gtk::Orientation, const std::string &pos);
+  Privacy(const std::string &, const Json::Value &, const std::string &pos);
  auto update() -> void override;

  void onPrivacyNodesChanged();
@@ -31,8 +34,6 @@ class Privacy : public AModule {
  uint iconSpacing = 4;
  uint iconSize = 20;
  uint transition_duration = 250;
-  std::set<std::pair<PrivacyNodeType, std::string>> ignore;
-  bool ignore_monitor = true;

  std::shared_ptr<util::PipewireBackend::PipewireBackend> backend = nullptr;
 };
--- a/include/modules/privacy/privacy_item.hpp
+++ b/include/modules/privacy/privacy_item.hpp
@@ -2,6 +2,9 @@

 #include <json/value.h>

+#include <iostream>
+#include <map>
+#include <mutex>
 #include <string>

 #include "gtkmm/box.h"
@@ -17,8 +20,8 @@ namespace waybar::modules::privacy {
 class PrivacyItem : public Gtk::Revealer {
 public:
  PrivacyItem(const Json::Value &config_, enum PrivacyNodeType privacy_type_,
-              std::list<PrivacyNodeInfo *> *nodes, Gtk::Orientation orientation,
-              const std::string &pos, const uint icon_size, const uint transition_duration);
+              std::list<PrivacyNodeInfo *> *nodes, const std::string &pos, const uint icon_size,
+              const uint transition_duration);

  enum PrivacyNodeType privacy_type;

--- a/include/modules/river/layout.hpp
+++ b/include/modules/river/layout.hpp
@@ -24,7 +24,6 @@ class Layout : public waybar::ALabel {

 private:
  const waybar::Bar &bar_;
-  std::string name_;
  struct wl_output *output_;          // stores the output this module belongs to
  struct wl_output *focused_output_;  // stores the currently focused output
  struct zriver_output_status_v1 *output_status_;
--- a/include/modules/river/tags.hpp
+++ b/include/modules/river/tags.hpp
@@ -21,7 +21,6 @@ class Tags : public waybar::AModule {
  void handle_view_tags(struct wl_array *tags);
  void handle_urgent_tags(uint32_t tags);

-  void handle_show();
  void handle_primary_clicked(uint32_t tag);
  bool handle_button_press(GdkEventButton *event_button, uint32_t tag);

--- a/include/modules/sni/icon_manager.hpp
+++ b/include/modules/sni/icon_manager.hpp
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <json/json.h>
-#include <spdlog/spdlog.h>
-
-#include <string>
-#include <unordered_map>
-
-class IconManager {
- public:
-  static IconManager& instance() {
-    static IconManager instance;
-    return instance;
-  }
-
-  void setIconsConfig(const Json::Value& icons_config) {
-    if (icons_config.isObject()) {
-      for (const auto& key : icons_config.getMemberNames()) {
-        std::string app_name = key;
-        const Json::Value& icon_value = icons_config[key];
-
-        if (icon_value.isString()) {
-          std::string icon_path = icon_value.asString();
-          icons_map_[app_name] = icon_path;
-        }
-      }
-    } else {
-      spdlog::warn("Invalid icon config format.");
-    }
-  }
-
-  std::string getIconForApp(const std::string& app_name) const {
-    auto it = icons_map_.find(app_name);
-    if (it != icons_map_.end()) {
-      return it->second;
-    }
-    return "";
-  }
-
- private:
-  IconManager() = default;
-  std::unordered_map<std::string, std::string> icons_map_;
-};
--- a/include/modules/sni/item.hpp
+++ b/include/modules/sni/item.hpp
@@ -26,7 +26,7 @@ struct ToolTip {
 class Item : public sigc::trackable {
 public:
  Item(const std::string&, const std::string&, const Json::Value&, const Bar&);
-  ~Item();
+  ~Item() = default;

  std::string bus_name;
  std::string object_path;
@@ -62,7 +62,6 @@ class Item : public sigc::trackable {
  void proxyReady(Glib::RefPtr<Gio::AsyncResult>& result);
  void setProperty(const Glib::ustring& name, Glib::VariantBase& value);
  void setStatus(const Glib::ustring& value);
-  void setCustomIcon(const std::string& id);
  void getUpdatedProperties();
  void processUpdatedProperties(Glib::RefPtr<Gio::AsyncResult>& result);
  void onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name,
@@ -77,8 +76,6 @@ class Item : public sigc::trackable {
  void makeMenu();
  bool handleClick(GdkEventButton* const& /*ev*/);
  bool handleScroll(GdkEventScroll* const&);
-  bool handleMouseEnter(GdkEventCrossing* const&);
-  bool handleMouseLeave(GdkEventCrossing* const&);

  // smooth scrolling threshold
  gdouble scroll_threshold_ = 0;
--- a/include/modules/sni/tray.hpp
+++ b/include/modules/sni/tray.hpp
@@ -21,7 +21,6 @@ class Tray : public AModule {
  void onRemove(std::unique_ptr<Item>& item);

  static inline std::size_t nb_hosts_ = 0;
-  bool show_passive_ = false;
  Gtk::Box box_;
  SNI::Watcher::singleton watcher_;
  SNI::Host host_;
--- a/include/modules/sway/language.hpp
+++ b/include/modules/sway/language.hpp
@@ -21,7 +21,7 @@ class Language : public ALabel, public sigc::trackable {
  auto update() -> void override;

 private:
-  enum class DisplayedShortFlag { None = 0, ShortName = 1, ShortDescription = 1 << 1 };
+  enum class DispayedShortFlag { None = 0, ShortName = 1, ShortDescription = 1 << 1 };

  struct Layout {
    std::string full_name;
@@ -56,9 +56,8 @@ class Language : public ALabel, public sigc::trackable {
  Layout layout_;
  std::string tooltip_format_ = "";
  std::map<std::string, Layout> layouts_map_;
-  bool hide_single_;
  bool is_variant_displayed;
-  std::byte displayed_short_flag = static_cast<std::byte>(DisplayedShortFlag::None);
+  std::byte displayed_short_flag = static_cast<std::byte>(DispayedShortFlag::None);

  util::JsonParser parser_;
  std::mutex mutex_;
--- a/include/modules/sway/window.hpp
+++ b/include/modules/sway/window.hpp
@@ -19,11 +19,10 @@ class Window : public AAppIconLabel, public sigc::trackable {
  auto update() -> void override;

 private:
-  void setClass(const std::string& classname, bool enable);
+  void setClass(std::string classname, bool enable);
  void onEvent(const struct Ipc::ipc_response&);
  void onCmd(const struct Ipc::ipc_response&);
-  std::tuple<std::size_t, int, int, std::string, std::string, std::string, std::string, std::string,
-             std::string>
+  std::tuple<std::size_t, int, int, std::string, std::string, std::string, std::string, std::string>
  getFocusedNode(const Json::Value& nodes, std::string& output);
  void getTree();

@@ -36,7 +35,6 @@ class Window : public AAppIconLabel, public sigc::trackable {
  std::string old_app_id_;
  std::size_t app_nb_;
  std::string shell_;
-  std::string marks_;
  int floating_count_;
  util::JsonParser parser_;
  std::mutex mutex_;
--- a/include/modules/sway/workspaces.hpp
+++ b/include/modules/sway/workspaces.hpp
@@ -12,14 +12,13 @@
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
-#include "util/regex_collection.hpp"

 namespace waybar::modules::sway {

 class Workspaces : public AModule, public sigc::trackable {
 public:
  Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
-  ~Workspaces() override = default;
+  virtual ~Workspaces() = default;
  auto update() -> void override;

 private:
@@ -28,28 +27,23 @@ class Workspaces : public AModule, public sigc::trackable {
      R"(workspace {} "{}"; move workspace to output "{}"; workspace {} "{}")";

  static int convertWorkspaceNameToNum(std::string name);
-  static int windowRewritePriorityFunction(std::string const& window_rule);

  void onCmd(const struct Ipc::ipc_response&);
  void onEvent(const struct Ipc::ipc_response&);
  bool filterButtons();
-  static bool hasFlag(const Json::Value&, const std::string&);
-  void updateWindows(const Json::Value&, std::string&);
  Gtk::Button& addButton(const Json::Value&);
  void onButtonReady(const Json::Value&, Gtk::Button&);
  std::string getIcon(const std::string&, const Json::Value&);
-  std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
+  const std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
  uint16_t getWorkspaceIndex(const std::string& name) const;
-  static std::string trimWorkspaceName(std::string);
-  bool handleScroll(GdkEventScroll* /*unused*/) override;
+  std::string trimWorkspaceName(std::string);
+  bool handleScroll(GdkEventScroll*) override;

  const Bar& bar_;
  std::vector<Json::Value> workspaces_;
  std::vector<std::string> high_priority_named_;
  std::vector<std::string> workspaces_order_;
  Gtk::Box box_;
-  std::string m_formatWindowSeparator;
-  util::RegexCollection m_windowRewriteRules;
  util::JsonParser parser_;
  std::unordered_map<std::string, Gtk::Button> buttons_;
  std::mutex mutex_;
--- a/include/modules/systemd_failed_units.hpp
+++ b/include/modules/systemd_failed_units.hpp
@@ -1,8 +1,7 @@
 #pragma once

-#include <giomm/dbusproxy.h>
-
 #include <string>
+#include <giomm/dbusproxy.h>

 #include "ALabel.hpp"

@@ -10,7 +9,7 @@ namespace waybar::modules {

 class SystemdFailedUnits : public ALabel {
 public:
-  SystemdFailedUnits(const std::string &, const Json::Value &);
+  SystemdFailedUnits(const std::string&, const Json::Value&);
  virtual ~SystemdFailedUnits();
  auto update() -> void override;

@@ -19,15 +18,12 @@ class SystemdFailedUnits : public ALabel {
  std::string format_ok;

  bool update_pending;
-  std::string system_state, user_state, overall_state;
-  uint32_t nr_failed_system, nr_failed_user, nr_failed;
  std::string last_status;
+  uint32_t nr_failed_system, nr_failed_user;
  Glib::RefPtr<Gio::DBus::Proxy> system_proxy, user_proxy;

  void notify_cb(const Glib::ustring &sender_name, const Glib::ustring &signal_name,
                 const Glib::VariantContainerBase &arguments);
-  void RequestFailedUnits();
-  void RequestSystemState();
  void updateData();
 };

--- a/include/modules/temperature.hpp
+++ b/include/modules/temperature.hpp
@@ -18,7 +18,6 @@ class Temperature : public ALabel {
 private:
  float getTemperature();
  bool isCritical(uint16_t);
-  bool isWarning(uint16_t);

  std::string file_path_;
  util::SleeperThread thread_;
--- a/include/modules/upower.hpp
+++ b/include/modules/upower.hpp
@@ -1,94 +0,0 @@
-#pragma once
-
-#include <giomm/dbusconnection.h>
-#include <gtkmm/icontheme.h>
-#include <libupower-glib/upower.h>
-
-#include <unordered_map>
-
-#include "AIconLabel.hpp"
-
-namespace waybar::modules {
-
-class UPower final : public AIconLabel {
- public:
-  UPower(const std::string &, const Json::Value &);
-  virtual ~UPower();
-  auto update() -> void override;
-
- private:
-  const std::string NO_BATTERY{"battery-missing-symbolic"};
-
-  // Config
-  bool showIcon_{true};
-  bool hideIfEmpty_{true};
-  int iconSize_{20};
-  int tooltip_spacing_{4};
-  int tooltip_padding_{4};
-  Gtk::Box contentBox_;  // tooltip box
-  std::string tooltipFormat_;
-
-  // UPower device info
-  struct upDevice_output {
-    UpDevice *upDevice{NULL};
-    double percentage{0.0};
-    double temperature{0.0};
-    guint64 time_full{0u};
-    guint64 time_empty{0u};
-    gchar *icon_name{(char *)'\0'};
-    bool upDeviceValid{false};
-    UpDeviceState state;
-    UpDeviceKind kind;
-    char *nativePath{(char *)'\0'};
-    char *model{(char *)'\0'};
-  };
-
-  // Technical variables
-  std::string nativePath_;
-  std::string model_;
-  std::string lastStatus_;
-  Glib::ustring label_markup_;
-  std::mutex mutex_;
-  Glib::RefPtr<Gtk::IconTheme> gtkTheme_;
-  bool sleeping_;
-
-  // Technical functions
-  void addDevice(UpDevice *);
-  void removeDevice(const gchar *);
-  void removeDevices();
-  void resetDevices();
-  void setDisplayDevice();
-  const Glib::ustring getText(const upDevice_output &upDevice_, const std::string &format);
-  bool queryTooltipCb(int, int, bool, const Glib::RefPtr<Gtk::Tooltip> &);
-
-  // DBUS variables
-  guint watcherID_;
-  Glib::RefPtr<Gio::DBus::Connection> conn_;
-  guint subscrID_{0u};
-
-  // UPower variables
-  UpClient *upClient_;
-  upDevice_output upDevice_;  // Device to display
-  typedef std::unordered_map<std::string, upDevice_output> Devices;
-  Devices devices_;
-  bool upRunning_{true};
-
-  // DBus callbacks
-  void getConn_cb(Glib::RefPtr<Gio::AsyncResult> &result);
-  void onAppear(const Glib::RefPtr<Gio::DBus::Connection> &, const Glib::ustring &,
-                const Glib::ustring &);
-  void onVanished(const Glib::RefPtr<Gio::DBus::Connection> &, const Glib::ustring &);
-  void prepareForSleep_cb(const Glib::RefPtr<Gio::DBus::Connection> &connection,
-                          const Glib::ustring &sender_name, const Glib::ustring &object_path,
-                          const Glib::ustring &interface_name, const Glib::ustring &signal_name,
-                          const Glib::VariantContainerBase &parameters);
-
-  // UPower callbacks
-  static void deviceAdded_cb(UpClient *client, UpDevice *device, gpointer data);
-  static void deviceRemoved_cb(UpClient *client, const gchar *objectPath, gpointer data);
-  static void deviceNotify_cb(UpDevice *device, GParamSpec *pspec, gpointer user_data);
-  // UPower secondary functions
-  void getUpDeviceInfo(upDevice_output &upDevice_);
-};
-
-}  // namespace waybar::modules
--- a/include/modules/upower/upower.hpp
+++ b/include/modules/upower/upower.hpp
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <libupower-glib/upower.h>
+
+#include <iostream>
+#include <map>
+#include <string>
+#include <unordered_map>
+
+#include "ALabel.hpp"
+#include "glibconfig.h"
+#include "gtkmm/box.h"
+#include "gtkmm/image.h"
+#include "gtkmm/label.h"
+#include "modules/upower/upower_tooltip.hpp"
+
+namespace waybar::modules::upower {
+
+class UPower : public AModule {
+ public:
+  UPower(const std::string &, const Json::Value &);
+  virtual ~UPower();
+  auto update() -> void override;
+
+ private:
+  typedef std::unordered_map<std::string, UpDevice *> Devices;
+
+  const std::string DEFAULT_FORMAT = "{percentage}";
+  const std::string DEFAULT_FORMAT_ALT = "{percentage} {time}";
+
+  static void deviceAdded_cb(UpClient *client, UpDevice *device, gpointer data);
+  static void deviceRemoved_cb(UpClient *client, const gchar *objectPath, gpointer data);
+  static void deviceNotify_cb(UpDevice *device, GParamSpec *pspec, gpointer user_data);
+  static void prepareForSleep_cb(GDBusConnection *system_bus, const gchar *sender_name,
+                                 const gchar *object_path, const gchar *interface_name,
+                                 const gchar *signal_name, GVariant *parameters,
+                                 gpointer user_data);
+  static void upowerAppear(GDBusConnection *conn, const gchar *name, const gchar *name_owner,
+                           gpointer data);
+  static void upowerDisappear(GDBusConnection *connection, const gchar *name, gpointer user_data);
+
+  void removeDevice(const gchar *objectPath);
+  void addDevice(UpDevice *device);
+  void setDisplayDevice();
+  void resetDevices();
+  void removeDevices();
+  bool show_tooltip_callback(int, int, bool, const Glib::RefPtr<Gtk::Tooltip> &tooltip);
+  bool handleToggle(GdkEventButton *const &) override;
+  std::string timeToString(gint64 time);
+
+  const std::string getDeviceStatus(UpDeviceState &state);
+
+  Gtk::Box box_;
+  Gtk::Image icon_;
+  Gtk::Label label_;
+
+  // Config
+  bool hideIfEmpty = true;
+  bool tooltip_enabled = true;
+  uint tooltip_spacing = 4;
+  uint tooltip_padding = 4;
+  uint iconSize = 20;
+  std::string format = DEFAULT_FORMAT;
+  std::string format_alt = DEFAULT_FORMAT_ALT;
+
+  Devices devices;
+  std::mutex m_Mutex;
+  UpClient *client;
+  UpDevice *displayDevice;
+  guint login1_id;
+  GDBusConnection *login1_connection;
+  std::unique_ptr<UPowerTooltip> upower_tooltip;
+  std::string lastStatus;
+  bool showAltText;
+  bool showIcon = true;
+  bool upowerRunning;
+  guint upowerWatcher_id;
+  std::string nativePath_;
+};
+
+}  // namespace waybar::modules::upower
--- a/include/modules/upower/upower_tooltip.hpp
+++ b/include/modules/upower/upower_tooltip.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <libupower-glib/upower.h>
+
+#include <memory>
+#include <unordered_map>
+
+#include "gtkmm/box.h"
+#include "gtkmm/label.h"
+#include "gtkmm/window.h"
+
+namespace waybar::modules::upower {
+
+class UPowerTooltip : public Gtk::Window {
+ private:
+  typedef std::unordered_map<std::string, UpDevice*> Devices;
+
+  const std::string getDeviceIcon(UpDeviceKind& kind);
+
+  std::unique_ptr<Gtk::Box> contentBox;
+
+  uint iconSize;
+  uint tooltipSpacing;
+  uint tooltipPadding;
+
+ public:
+  UPowerTooltip(uint iconSize, uint tooltipSpacing, uint tooltipPadding);
+  virtual ~UPowerTooltip();
+
+  uint updateTooltip(Devices& devices);
+};
+
+}  // namespace waybar::modules::upower
--- a/include/modules/user.hpp
+++ b/include/modules/user.hpp
@@ -14,7 +14,7 @@ class User : public AIconLabel {
  virtual ~User() = default;
  auto update() -> void override;

-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;

 private:
  util::SleeperThread thread_;
--- a/include/modules/wayfire/backend.hpp
+++ b/include/modules/wayfire/backend.hpp
@@ -1,122 +0,0 @@
-#pragma once
-
-#include <json/json.h>
-#include <unistd.h>
-
-#include <functional>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-namespace waybar::modules::wayfire {
-
-using EventHandler = std::function<void(const std::string& event)>;
-
-struct State {
-  /*
-    ┌───────────┐ ┌───────────┐
-    │ output #1 │ │ output #2 │
-    └─────┬─────┘ └─────┬─────┘
-          └─┐           └─────┐─ ─ ─ ─ ─ ─ ─ ─ ┐
-    ┌───────┴───────┐ ┌───────┴──────┐ ┌───────┴───────┐
-    │ wset #1       │ │ wset #2      │ │ wset #3       │
-    │┌────────────┐ │ │┌────────────┐│ │┌────────────┐ │
-    ││ workspaces │ │ ││ workspaces ││ ││ workspaces │ │
-    │└─┬──────────┘ │ │└────────────┘│ │└─┬──────────┘ │
-    │  │ ┌─────────┐│ └──────────────┘ │  │ ┌─────────┐│
-    │  ├─┤ view #1 ││                  │  └─┤ view #3 ││
-    │  │ └─────────┘│                  │    └─────────┘│
-    │  │ ┌─────────┐│                  └───────────────┘
-    │  └─┤ view #2 ││
-    │    └─────────┘│
-    └───────────────┘
-  */
-
-  struct Output {
-    size_t id;
-    size_t w, h;
-    size_t wset_idx;
-  };
-
-  struct Workspace {
-    size_t num_views;
-    size_t num_sticky_views;
-  };
-
-  struct Wset {
-    std::optional<std::reference_wrapper<Output>> output;
-    std::vector<Workspace> wss;
-    size_t ws_w, ws_h, ws_x, ws_y;
-    size_t focused_view_id;
-
-    auto ws_idx() const { return ws_w * ws_y + ws_x; }
-    auto count_ws(const Json::Value& pos) -> Workspace&;
-    auto locate_ws(const Json::Value& geo) -> Workspace&;
-    auto locate_ws(const Json::Value& geo) const -> const Workspace&;
-  };
-
-  std::unordered_map<std::string, Output> outputs;
-  std::unordered_map<size_t, Wset> wsets;
-  std::unordered_map<size_t, Json::Value> views;
-  std::string focused_output_name;
-  size_t maybe_empty_focus_wset_idx = {};
-  size_t vswitch_sticky_view_id = {};
-  bool new_output_detected = {};
-  bool vswitching = {};
-
-  auto update_view(const Json::Value& view) -> void;
-};
-
-struct Sock {
-  int fd;
-
-  Sock(int fd) : fd{fd} {}
-  ~Sock() { close(fd); }
-  Sock(const Sock&) = delete;
-  auto operator=(const Sock&) = delete;
-  Sock(Sock&& rhs) noexcept {
-    fd = rhs.fd;
-    rhs.fd = -1;
-  }
-  auto& operator=(Sock&& rhs) noexcept {
-    fd = rhs.fd;
-    rhs.fd = -1;
-    return *this;
-  }
-};
-
-class IPC {
-  static std::weak_ptr<IPC> instance;
-  Json::CharReaderBuilder reader_builder;
-  Json::StreamWriterBuilder writer_builder;
-  std::list<std::pair<std::string, std::reference_wrapper<const EventHandler>>> handlers;
-  std::mutex handlers_mutex;
-  State state;
-  std::mutex state_mutex;
-
-  IPC() { start(); }
-
-  static auto connect() -> Sock;
-  auto receive(Sock& sock) -> Json::Value;
-  auto start() -> void;
-  auto root_event_handler(const std::string& event, const Json::Value& data) -> void;
-  auto update_state_handler(const std::string& event, const Json::Value& data) -> void;
-
- public:
-  static auto get_instance() -> std::shared_ptr<IPC>;
-  auto send(const std::string& method, Json::Value&& data) -> Json::Value;
-  auto register_handler(const std::string& event, const EventHandler& handler) -> void;
-  auto unregister_handler(EventHandler& handler) -> void;
-
-  auto lock_state() -> std::lock_guard<std::mutex> { return std::lock_guard{state_mutex}; }
-  auto& get_outputs() const { return state.outputs; }
-  auto& get_wsets() const { return state.wsets; }
-  auto& get_views() const { return state.views; }
-  auto& get_focused_output_name() const { return state.focused_output_name; }
-};
-
-}  // namespace waybar::modules::wayfire
--- a/include/modules/wayfire/window.hpp
+++ b/include/modules/wayfire/window.hpp
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "AAppIconLabel.hpp"
-#include "bar.hpp"
-#include "modules/wayfire/backend.hpp"
-
-namespace waybar::modules::wayfire {
-
-class Window : public AAppIconLabel {
-  std::shared_ptr<IPC> ipc;
-  EventHandler handler;
-
-  const Bar& bar_;
-  std::string old_app_id_;
-
- public:
-  Window(const std::string& id, const Bar& bar, const Json::Value& config);
-  ~Window() override;
-
-  auto update() -> void override;
-  auto update_icon_label() -> void;
-};
-
-}  // namespace waybar::modules::wayfire
--- a/include/modules/wayfire/workspaces.hpp
+++ b/include/modules/wayfire/workspaces.hpp
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <json/json.h>
-
-#include <memory>
-#include <vector>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/wayfire/backend.hpp"
-
-namespace waybar::modules::wayfire {
-
-class Workspaces : public AModule {
-  std::shared_ptr<IPC> ipc;
-  EventHandler handler;
-
-  const Bar& bar_;
-  Gtk::Box box_;
-  std::vector<Gtk::Button> buttons_;
-
-  auto handleScroll(GdkEventScroll* e) -> bool override;
-  auto update() -> void override;
-  auto update_box() -> void;
-
- public:
-  Workspaces(const std::string& id, const Bar& bar, const Json::Value& config);
-  ~Workspaces() override;
-};
-
-}  // namespace waybar::modules::wayfire
--- a/include/modules/wireplumber.hpp
+++ b/include/modules/wireplumber.hpp
@@ -17,25 +17,18 @@ class Wireplumber : public ALabel {
  auto update() -> void override;

 private:
-  void asyncLoadRequiredApiModules();
-  void prepare(waybar::modules::Wireplumber* self);
+  void loadRequiredApiModules();
+  void prepare();
  void activatePlugins();
  static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
  static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
-  static void updateSourceVolume(waybar::modules::Wireplumber* self, uint32_t id);
-  static void updateSourceName(waybar::modules::Wireplumber* self, uint32_t id);  // NEW
  static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
-  static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
-                                      waybar::modules::Wireplumber* self);
-  static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
  static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
  static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
  static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self);

  bool handleScroll(GdkEventScroll* e) override;

-  static std::list<waybar::modules::Wireplumber*> modules;
-
  WpCore* wp_core_;
  GPtrArray* apis_;
  WpObjectManager* om_;
@@ -48,12 +41,6 @@ class Wireplumber : public ALabel {
  double min_step_;
  uint32_t node_id_{0};
  std::string node_name_;
-  std::string source_name_;
-  gchar* type_;
-  uint32_t source_node_id_;
-  bool source_muted_;
-  double source_volume_;
-  gchar* default_source_name_;
 };

 }  // namespace waybar::modules
--- a/include/modules/wlr/taskbar.hpp
+++ b/include/modules/wlr/taskbar.hpp
@@ -19,16 +19,11 @@
 #include "bar.hpp"
 #include "client.hpp"
 #include "giomm/desktopappinfo.h"
-#include "util/icon_loader.hpp"
 #include "util/json.hpp"
 #include "wlr-foreign-toplevel-management-unstable-v1-client-protocol.h"

 namespace waybar::modules::wlr {

-struct widget_geometry {
-  int x, y, w, h;
-};
-
 class Taskbar;

 class Task {
@@ -47,7 +42,6 @@ class Task {
  };
  // made public so TaskBar can reorder based on configuration.
  Gtk::Button button;
-  struct widget_geometry minimize_hint;

 private:
  static uint32_t global_id;
@@ -88,8 +82,9 @@ class Task {
 private:
  std::string repr() const;
  std::string state_string(bool = false) const;
-  void set_minimize_hint();
-  void on_button_size_allocated(Gtk::Allocation &alloc);
+  void set_app_info_from_app_id_list(const std::string &app_id_list);
+  bool image_load_icon(Gtk::Image &image, const Glib::RefPtr<Gtk::IconTheme> &icon_theme,
+                       Glib::RefPtr<Gio::DesktopAppInfo> app_info, int size);
  void hide_if_ignored();

 public:
@@ -151,7 +146,7 @@ class Taskbar : public waybar::AModule {
  Gtk::Box box_;
  std::vector<TaskPtr> tasks_;

-  IconLoader icon_loader_;
+  std::vector<Glib::RefPtr<Gtk::IconTheme>> icon_themes_;
  std::unordered_set<std::string> ignore_list_;
  std::map<std::string, std::string> app_ids_replace_map_;

@@ -176,7 +171,7 @@ class Taskbar : public waybar::AModule {
  bool show_output(struct wl_output *) const;
  bool all_outputs() const;

-  const IconLoader &icon_loader() const;
+  const std::vector<Glib::RefPtr<Gtk::IconTheme>> &icon_themes() const;
  const std::unordered_set<std::string> &ignore_list() const;
  const std::map<std::string, std::string> &app_ids_replace_map() const;
 };
--- a/include/modules/wlr/workspace_manager.hpp
+++ b/include/modules/wlr/workspace_manager.hpp
@@ -0,0 +1,172 @@
+#pragma once
+
+#include <fmt/format.h>
+#include <gtkmm/button.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
+
+#include <functional>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "AModule.hpp"
+#include "bar.hpp"
+#include "ext-workspace-unstable-v1-client-protocol.h"
+
+namespace waybar::modules::wlr {
+
+class WorkspaceManager;
+class WorkspaceGroup;
+
+class Workspace {
+ public:
+  Workspace(const waybar::Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group,
+            zext_workspace_handle_v1 *workspace, uint32_t id, std::string name);
+  ~Workspace();
+  auto update() -> void;
+
+  auto id() const -> uint32_t { return id_; }
+  auto is_active() const -> bool { return state_ & static_cast<uint32_t>(State::ACTIVE); }
+  auto is_urgent() const -> bool { return state_ & static_cast<uint32_t>(State::URGENT); }
+  auto is_hidden() const -> bool { return state_ & static_cast<uint32_t>(State::HIDDEN); }
+  auto is_empty() const -> bool { return state_ & static_cast<uint32_t>(State::EMPTY); }
+  auto is_persistent() const -> bool { return persistent_; }
+  // wlr stuff
+  auto handle_name(const std::string &name) -> void;
+  auto handle_coordinates(const std::vector<uint32_t> &coordinates) -> void;
+  auto handle_state(const std::vector<uint32_t> &state) -> void;
+  auto handle_remove() -> void;
+  auto make_persistent() -> void;
+  auto handle_duplicate() -> void;
+
+  auto handle_done() -> void;
+  auto handle_clicked(GdkEventButton *bt) -> bool;
+  auto show() -> void;
+  auto hide() -> void;
+  auto get_button_ref() -> Gtk::Button & { return button_; }
+  auto get_name() -> std::string & { return name_; }
+  auto get_coords() -> std::vector<uint32_t> & { return coordinates_; }
+
+  enum class State {
+    ACTIVE = (1 << 0),
+    URGENT = (1 << 1),
+    HIDDEN = (1 << 2),
+    EMPTY = (1 << 3),
+  };
+
+ private:
+  auto get_icon() -> std::string;
+
+  const Bar &bar_;
+  const Json::Value &config_;
+  WorkspaceGroup &workspace_group_;
+
+  // wlr stuff
+  zext_workspace_handle_v1 *workspace_handle_;
+  uint32_t state_ = 0;
+
+  uint32_t id_;
+  std::string name_;
+  std::vector<uint32_t> coordinates_;
+  static std::map<std::string, std::string> icons_map_;
+  std::string format_;
+  bool with_icon_ = false;
+  bool persistent_ = false;
+
+  Gtk::Button button_;
+  Gtk::Box content_;
+  Gtk::Label label_;
+};
+
+class WorkspaceGroup {
+ public:
+  WorkspaceGroup(const waybar::Bar &bar, Gtk::Box &box, const Json::Value &config,
+                 WorkspaceManager &manager, zext_workspace_group_handle_v1 *workspace_group_handle,
+                 uint32_t id);
+  ~WorkspaceGroup();
+  auto update() -> void;
+
+  auto id() const -> uint32_t { return id_; }
+  auto is_visible() const -> bool;
+  auto remove_workspace(uint32_t id_) -> void;
+  auto active_only() const -> bool;
+  auto creation_delayed() const -> bool;
+  auto workspaces() -> std::vector<std::unique_ptr<Workspace>> & { return workspaces_; }
+  auto persistent_workspaces() -> std::vector<std::string> & { return persistent_workspaces_; }
+
+  auto sort_workspaces() -> void;
+  auto set_need_to_sort() -> void { need_to_sort = true; }
+  auto add_button(Gtk::Button &button) -> void;
+  auto remove_button(Gtk::Button &button) -> void;
+  auto fill_persistent_workspaces() -> void;
+  auto create_persistent_workspaces() -> void;
+
+  // wlr stuff
+  auto handle_workspace_create(zext_workspace_handle_v1 *workspace_handle) -> void;
+  auto handle_remove() -> void;
+  auto handle_output_enter(wl_output *output) -> void;
+  auto handle_output_leave() -> void;
+  auto handle_done() -> void;
+  auto commit() -> void;
+
+ private:
+  static uint32_t workspace_global_id;
+  const waybar::Bar &bar_;
+  Gtk::Box &box_;
+  const Json::Value &config_;
+  WorkspaceManager &workspace_manager_;
+
+  // wlr stuff
+  zext_workspace_group_handle_v1 *workspace_group_handle_;
+  wl_output *output_ = nullptr;
+
+  uint32_t id_;
+  std::vector<std::unique_ptr<Workspace>> workspaces_;
+  bool need_to_sort = false;
+  std::vector<std::string> persistent_workspaces_;
+  bool persistent_created_ = false;
+};
+
+class WorkspaceManager : public AModule {
+ public:
+  WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config);
+  ~WorkspaceManager() override;
+  auto update() -> void override;
+
+  auto all_outputs() const -> bool { return all_outputs_; }
+  auto active_only() const -> bool { return active_only_; }
+  auto workspace_comparator() const
+      -> std::function<bool(std::unique_ptr<Workspace> &, std::unique_ptr<Workspace> &)>;
+  auto creation_delayed() const -> bool { return creation_delayed_; }
+
+  auto sort_workspaces() -> void;
+  auto remove_workspace_group(uint32_t id_) -> void;
+
+  // wlr stuff
+  auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void;
+  auto handle_workspace_group_create(zext_workspace_group_handle_v1 *workspace_group_handle)
+      -> void;
+  auto handle_done() -> void;
+  auto handle_finished() -> void;
+  auto commit() -> void;
+
+ private:
+  const waybar::Bar &bar_;
+  Gtk::Box box_;
+  std::vector<std::unique_ptr<WorkspaceGroup>> groups_;
+
+  // wlr stuff
+  zext_workspace_manager_v1 *workspace_manager_ = nullptr;
+
+  static uint32_t group_global_id;
+
+  bool sort_by_name_ = true;
+  bool sort_by_coordinates_ = true;
+  bool sort_by_number_ = false;
+  bool all_outputs_ = false;
+  bool active_only_ = false;
+  bool creation_delayed_ = false;
+};
+
+}  // namespace waybar::modules::wlr
--- a/include/modules/wlr/workspace_manager_binding.hpp
+++ b/include/modules/wlr/workspace_manager_binding.hpp
@@ -0,0 +1,10 @@
+#include "ext-workspace-unstable-v1-client-protocol.h"
+
+namespace waybar::modules::wlr {
+void add_registry_listener(void *data);
+void add_workspace_listener(zext_workspace_handle_v1 *workspace_handle, void *data);
+void add_workspace_group_listener(zext_workspace_group_handle_v1 *workspace_group_handle,
+                                  void *data);
+zext_workspace_manager_v1 *workspace_manager_bind(wl_registry *registry, uint32_t name,
+                                                  uint32_t version, void *data);
+}  // namespace waybar::modules::wlr
--- a/include/util/SafeSignal.hpp
+++ b/include/util/SafeSignal.hpp
@@ -11,11 +11,6 @@
 #include <type_traits>
 #include <utility>

-#ifdef __OpenBSD__
-#define SIGRTMIN SIGUSR1 - 1
-#define SIGRTMAX SIGUSR1 + 1
-#endif
-
 namespace waybar {

 /**
@@ -57,7 +52,7 @@ struct SafeSignal : sigc::signal<void(std::decay_t<Args>...)> {
  using slot_t = decltype(std::declval<signal_t>().make_slot());
  using arg_tuple_t = std::tuple<std::decay_t<Args>...>;
  // ensure that unwrapped methods are not accessible
-  using signal_t::emit_reverse;
+  using signal_t::emit;
  using signal_t::make_slot;

  void handle_event() {
--- a/include/util/audio_backend.hpp
+++ b/include/util/audio_backend.hpp
@@ -22,7 +22,6 @@ class AudioBackend {
  static void sourceInfoCb(pa_context*, const pa_source_info* i, int, void* data);
  static void serverInfoCb(pa_context*, const pa_server_info*, void*);
  static void volumeModifyCb(pa_context*, int, void*);
-  void connectContext();

  pa_threaded_mainloop* mainloop_;
  pa_mainloop_api* mainloop_api_;
@@ -38,8 +37,6 @@ class AudioBackend {
  std::string desc_;
  std::string monitor_;
  std::string current_sink_name_;
-  std::string default_sink_name;
-  bool default_sink_running_;
  bool current_sink_running_;
  // SOURCE
  uint32_t source_idx_{0};
--- a/include/util/backlight_backend.hpp
+++ b/include/util/backlight_backend.hpp
@@ -20,7 +20,7 @@
    std::scoped_lock<std::mutex> lock((backend).udev_thread_mutex_); \
    __devices = (backend).devices_;                                  \
  }                                                                  \
-  auto varname = (backend).best_device(__devices, preferred_device);
+  auto varname = (backend).best_device(__devices.cbegin(), __devices.cend(), preferred_device);

 namespace waybar::util {

@@ -56,21 +56,27 @@ class BacklightBackend {

  void set_previous_best_device(const BacklightDevice *device);

-  void set_brightness(const std::string &preferred_device, ChangeType change_type, double step);
+  void set_brightness(std::string preferred_device, ChangeType change_type, double step);

-  void set_scaled_brightness(const std::string &preferred_device, int brightness);
-  int get_scaled_brightness(const std::string &preferred_device);
+  void set_scaled_brightness(std::string preferred_device, int brightness);
+  int get_scaled_brightness(std::string preferred_device);
+
+  template <class ForwardIt, class Inserter>
+  static void upsert_device(ForwardIt first, ForwardIt last, Inserter inserter, udev_device *dev);
+
+  template <class ForwardIt, class Inserter>
+  static void enumerate_devices(ForwardIt first, ForwardIt last, Inserter inserter, udev *udev);

  bool is_login_proxy_initialized() const { return static_cast<bool>(login_proxy_); }

-  static const BacklightDevice *best_device(const std::vector<BacklightDevice> &devices,
-                                            std::string_view);
+  template <class ForwardIt>
+  static const BacklightDevice *best_device(ForwardIt first, ForwardIt last, std::string_view);

  std::vector<BacklightDevice> devices_;
  std::mutex udev_thread_mutex_;

 private:
-  void set_brightness_internal(const std::string &device_name, int brightness, int max_brightness);
+  void set_brightness_internal(std::string device_name, int brightness, int max_brightness);

  std::function<void()> on_updated_cb_;
  std::chrono::milliseconds polling_interval_;
@@ -84,4 +90,4 @@ class BacklightBackend {
  static constexpr int EPOLL_MAX_EVENTS = 16;
 };

-}  // namespace waybar::util
+}  // namespace waybar::util
--- a/include/util/css_reload_helper.hpp
+++ b/include/util/css_reload_helper.hpp
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "giomm/file.h"
-#include "giomm/filemonitor.h"
-#include "glibmm/refptr.h"
-
-struct pollfd;
-
-namespace waybar {
-class CssReloadHelper {
- public:
-  CssReloadHelper(std::string cssFile, std::function<void()> callback);
-
-  virtual ~CssReloadHelper() = default;
-
-  virtual void monitorChanges();
-
- protected:
-  std::vector<std::string> parseImports(const std::string& cssFile);
-
-  void parseImports(const std::string& cssFile, std::unordered_map<std::string, bool>& imports);
-
-  void watchFiles(const std::vector<std::string>& files);
-
-  bool handleInotifyEvents(int fd);
-
-  bool watch(int inotifyFd, pollfd* pollFd);
-
-  virtual std::string getFileContents(const std::string& filename);
-
-  virtual std::string findPath(const std::string& filename);
-
-  void handleFileChange(Glib::RefPtr<Gio::File> const& file,
-                        Glib::RefPtr<Gio::File> const& other_type,
-                        Gio::FileMonitorEvent event_type);
-
- private:
-  std::string m_cssFile;
-
-  std::function<void()> m_callback;
-
-  std::vector<std::tuple<Glib::RefPtr<Gio::FileMonitor>>> m_fileMonitors;
-};
-}  // namespace waybar
--- a/include/util/date.hpp
+++ b/include/util/date.hpp
@@ -15,7 +15,7 @@
 namespace date {
 #if HAVE_CHRONO_TIMEZONES
 using namespace std::chrono;
-using std::format;
+using namespace std;
 #else

 using system_clock = std::chrono::system_clock;
@@ -30,6 +30,10 @@ template <typename T>
 inline auto format(const std::locale& loc, const char* spec, const T& arg) {
  return date::format(loc, std::regex_replace(spec, std::regex("\\{:L|\\}"), ""), arg);
 }
+
+constexpr decltype(auto) operator""d(unsigned long long d) noexcept {
+  return date::operator""_d(d);  // very verbose, but it works
+}
 #endif
 }  // namespace date

@@ -64,7 +68,7 @@ struct fmt::formatter<date::zoned_time<Duration, TimeZonePtr>> {
  }

  template <typename FormatContext>
-  auto format(const date::zoned_time<Duration, TimeZonePtr>& ztime, FormatContext& ctx) const {
+  auto format(const date::zoned_time<Duration, TimeZonePtr>& ztime, FormatContext& ctx) {
    if (ctx.locale()) {
      const auto loc = ctx.locale().template get<std::locale>();
      return fmt::format_to(ctx.out(), "{}", date::format(loc, fmt::to_string(specs), ztime));
@@ -73,3 +77,5 @@ struct fmt::formatter<date::zoned_time<Duration, TimeZonePtr>> {
  }
 };
 #endif
+
+using namespace date;
--- a/include/util/format.hpp
+++ b/include/util/format.hpp
@@ -6,7 +6,7 @@
 class pow_format {
 public:
  pow_format(long long val, std::string&& unit, bool binary = false)
-      : val_(val), unit_(unit), binary_(binary) {};
+      : val_(val), unit_(unit), binary_(binary){};

  long long val_;
  std::string unit_;
@@ -45,7 +45,7 @@ struct formatter<pow_format> {
  }

  template <class FormatContext>
-  auto format(const pow_format& s, FormatContext& ctx) const -> decltype(ctx.out()) {
+  auto format(const pow_format& s, FormatContext& ctx) -> decltype(ctx.out()) {
    const char* units[] = {"", "k", "M", "G", "T", "P", nullptr};

    auto base = s.binary_ ? 1024ull : 1000ll;
--- a/include/util/gtk_icon.hpp
+++ b/include/util/gtk_icon.hpp
@@ -10,7 +10,5 @@ class DefaultGtkIconThemeWrapper {

 public:
  static bool has_icon(const std::string&);
-  static Glib::RefPtr<Gdk::Pixbuf> load_icon(
-      const char*, int, Gtk::IconLookupFlags,
-      Glib::RefPtr<Gtk::StyleContext> style = Glib::RefPtr<Gtk::StyleContext>());
+  static Glib::RefPtr<Gdk::Pixbuf> load_icon(const char*, int, Gtk::IconLookupFlags);
 };
--- a/include/util/icon_loader.hpp
+++ b/include/util/icon_loader.hpp
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <gdkmm/general.h>
-#include <gio/gdesktopappinfo.h>
-#include <giomm/desktopappinfo.h>
-#include <glibmm/fileutils.h>
-#include <gtkmm/image.h>
-#include <spdlog/spdlog.h>
-
-#include <string>
-#include <vector>
-
-#include "util/gtk_icon.hpp"
-
-class IconLoader {
- private:
-  std::vector<Glib::RefPtr<Gtk::IconTheme>> custom_icon_themes_;
-  Glib::RefPtr<Gtk::IconTheme> default_icon_theme_ = Gtk::IconTheme::get_default();
-  static std::vector<std::string> search_prefix();
-  static Glib::RefPtr<Gio::DesktopAppInfo> get_app_info_by_name(const std::string &app_id);
-  static Glib::RefPtr<Gio::DesktopAppInfo> get_desktop_app_info(const std::string &app_id);
-  static Glib::RefPtr<Gdk::Pixbuf> load_icon_from_file(std::string const &icon_path, int size);
-  static std::string get_icon_name_from_icon_theme(const Glib::RefPtr<Gtk::IconTheme> &icon_theme,
-                                                   const std::string &app_id);
-  static bool image_load_icon(Gtk::Image &image, const Glib::RefPtr<Gtk::IconTheme> &icon_theme,
-                              Glib::RefPtr<Gio::DesktopAppInfo> app_info, int size);
-
- public:
-  void add_custom_icon_theme(const std::string &theme_name);
-  bool image_load_icon(Gtk::Image &image, Glib::RefPtr<Gio::DesktopAppInfo> app_info,
-                       int size) const;
-  static Glib::RefPtr<Gio::DesktopAppInfo> get_app_info_from_app_id_list(
-      const std::string &app_id_list);
-};
--- a/include/util/json.hpp
+++ b/include/util/json.hpp
@@ -3,12 +3,6 @@
 #include <fmt/ostream.h>
 #include <json/json.h>

-#include <algorithm>
-#include <codecvt>
-#include <iostream>
-#include <locale>
-#include <regex>
-
 #if (FMT_VERSION >= 90000)

 template <>
@@ -18,31 +12,25 @@ struct fmt::formatter<Json::Value> : ostream_formatter {};

 namespace waybar::util {

-class JsonParser {
- public:
-  JsonParser() = default;
+struct JsonParser {
+  JsonParser() {}

-  Json::Value parse(const std::string& jsonStr) {
-    Json::Value root;
-
-    // replace all occurrences of "\x" with "\u00", because JSON doesn't allow "\x" escape sequences
-    std::string modifiedJsonStr = replaceHexadecimalEscape(jsonStr);
-
-    std::istringstream jsonStream(modifiedJsonStr);
-    std::string errs;
-    // Use local CharReaderBuilder for thread safety - the IPC singleton's
-    // parser can be called concurrently from multiple module threads
-    Json::CharReaderBuilder readerBuilder;
-    if (!Json::parseFromStream(readerBuilder, jsonStream, &root, &errs)) {
-      throw std::runtime_error("Error parsing JSON: " + errs);
+  const Json::Value parse(const std::string& data) const {
+    Json::Value root(Json::objectValue);
+    if (data.empty()) {
+      return root;
    }
+    std::unique_ptr<Json::CharReader> const reader(builder_.newCharReader());
+    std::string err;
+    bool res = reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
+    if (!res) throw std::runtime_error(err);
    return root;
  }

+  ~JsonParser() = default;
+
 private:
-  static std::string replaceHexadecimalEscape(const std::string& str) {
-    static std::regex re("\\\\x");
-    return std::regex_replace(str, re, "\\u00");
-  }
+  Json::CharReaderBuilder builder_;
 };
+
 }  // namespace waybar::util
--- a/include/util/kill_signal.hpp
+++ b/include/util/kill_signal.hpp
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <json/value.h>
-
-#include <cstdint>
-
-namespace waybar::util {
-
-enum class KillSignalAction : std::uint8_t {
-  TOGGLE,
-  RELOAD,
-  SHOW,
-  HIDE,
-  NOOP,
-};
-const std::map<std::string, KillSignalAction> userKillSignalActions = {
-    {"TOGGLE", KillSignalAction::TOGGLE},
-    {"RELOAD", KillSignalAction::RELOAD},
-    {"SHOW", KillSignalAction::SHOW},
-    {"HIDE", KillSignalAction::HIDE},
-    {"NOOP", KillSignalAction::NOOP}};
-
-const KillSignalAction SIGNALACTION_DEFAULT_SIGUSR1 = KillSignalAction::TOGGLE;
-const KillSignalAction SIGNALACTION_DEFAULT_SIGUSR2 = KillSignalAction::RELOAD;
-
-};  // namespace waybar::util
--- a/include/util/pipewire/pipewire_backend.hpp
+++ b/include/util/pipewire/pipewire_backend.hpp
@@ -2,8 +2,6 @@

 #include <pipewire/pipewire.h>

-#include <unordered_map>
-
 #include "util/backend_common.hpp"
 #include "util/pipewire/privacy_node_info.hpp"

@@ -15,8 +13,7 @@ class PipewireBackend {
  pw_context* context_;
  pw_core* core_;

-  pw_registry* registry_;
-  spa_hook registryListener_;
+  spa_hook registry_listener;

  /* Hack to keep constructor inaccessible but still public.
   * This is required to be able to use std::make_shared.
@@ -24,22 +21,20 @@ class PipewireBackend {
   * pointer because the destructor will manually free memory, and this could be
   * a problem with C++20's copy and move semantics.
   */
-  struct PrivateConstructorTag {};
+  struct private_constructor_tag {};

 public:
+  std::mutex mutex_;
+
+  pw_registry* registry;
+
  sigc::signal<void> privacy_nodes_changed_signal_event;

  std::unordered_map<uint32_t, PrivacyNodeInfo*> privacy_nodes;
-  std::mutex mutex_;

  static std::shared_ptr<PipewireBackend> getInstance();

-  // Handlers for PipeWire events
-  void handleRegistryEventGlobal(uint32_t id, uint32_t permissions, const char* type,
-                                 uint32_t version, const struct spa_dict* props);
-  void handleRegistryEventGlobalRemove(uint32_t id);
-
-  PipewireBackend(PrivateConstructorTag tag);
+  PipewireBackend(private_constructor_tag tag);
  ~PipewireBackend();
 };
 }  // namespace waybar::util::PipewireBackend
--- a/include/util/pipewire/privacy_node_info.hpp
+++ b/include/util/pipewire/privacy_node_info.hpp
@@ -25,7 +25,6 @@ class PrivacyNodeInfo {
  std::string media_name;
  std::string node_name;
  std::string application_name;
-  bool is_monitor = false;

  std::string pipewire_access_portal_app_id;
  std::string application_icon_name;
@@ -35,12 +34,29 @@ class PrivacyNodeInfo {

  void *data;

-  std::string getName();
-  std::string getIconName();
+  std::string get_name() {
+    const std::vector<std::string *> names{&application_name, &node_name};
+    std::string name = "Unknown Application";
+    for (auto &name_ : names) {
+      if (name_ != nullptr && name_->length() > 0) {
+        name = *name_;
+        name[0] = toupper(name[0]);
+        break;
+      }
+    }
+    return name;
+  }

-  // Handlers for PipeWire events
-  void handleProxyEventDestroy();
-  void handleNodeEventInfo(const struct pw_node_info *info);
+  std::string get_icon_name() {
+    const std::vector<std::string *> names{&application_icon_name, &pipewire_access_portal_app_id,
+                                           &application_name, &node_name};
+    const std::string name = "application-x-executable-symbolic";
+    for (auto &name_ : names) {
+      if (name_ != nullptr && name_->length() > 0 && DefaultGtkIconThemeWrapper::has_icon(*name_)) {
+        return *name_;
+      }
+    }
+    return name;
+  }
 };
-
 }  // namespace waybar::util::PipewireBackend
--- a/include/util/portal.hpp
+++ b/include/util/portal.hpp
@@ -6,18 +6,20 @@

 namespace waybar {

+using namespace Gio;
+
 enum class Appearance {
  UNKNOWN = 0,
  DARK = 1,
  LIGHT = 2,
 };
-class Portal : private Gio::DBus::Proxy {
+class Portal : private DBus::Proxy {
 public:
  Portal();
  void refreshAppearance();
  Appearance getAppearance();

-  typedef sigc::signal<void, Appearance> type_signal_appearance_changed;
+  typedef sigc::signal<void(Appearance)> type_signal_appearance_changed;
  type_signal_appearance_changed signal_appearance_changed() { return m_signal_appearance_changed; }

 private:
--- a/include/util/prepare_for_sleep.h
+++ b/include/util/prepare_for_sleep.h
@@ -4,6 +4,6 @@

 namespace waybar::util {

-// Get a signal emitted with value true when entering sleep, and false when exiting
+// Get a signal emited with value true when entering sleep, and false when exiting
 SafeSignal<bool>& prepare_for_sleep();
 }  // namespace waybar::util
--- a/include/util/regex_collection.hpp
+++ b/include/util/regex_collection.hpp
@@ -5,7 +5,6 @@
 #include <functional>
 #include <regex>
 #include <string>
-#include <utility>

 namespace waybar::util {

@@ -18,7 +17,7 @@ struct Rule {
  // See https://en.cppreference.com/w/cpp/compiler_support/20 "Parenthesized initialization of
  // aggregates"
  Rule(std::regex rule, std::string repr, int priority)
-      : rule(std::move(rule)), repr(std::move(repr)), priority(priority) {}
+      : rule(rule), repr(repr), priority(priority) {}
 };

 int default_priority_function(std::string& key);
@@ -37,17 +36,16 @@ class RegexCollection {
  std::map<std::string, std::string> regex_cache;
  std::string default_repr;

-  std::string find_match(std::string& value, bool& matched_any);
+  std::string& find_match(std::string& value, bool& matched_any);

 public:
  RegexCollection() = default;
-  RegexCollection(
-      const Json::Value& map, std::string default_repr = "",
-      const std::function<int(std::string&)>& priority_function = default_priority_function);
+  RegexCollection(const Json::Value& map, std::string default_repr = "",
+                  std::function<int(std::string&)> priority_function = default_priority_function);
  ~RegexCollection() = default;

  std::string& get(std::string& value, bool& matched_any);
  std::string& get(std::string& value);
 };

-}  // namespace waybar::util
+}  // namespace waybar::util
--- a/include/util/rfkill.hpp
+++ b/include/util/rfkill.hpp
@@ -5,8 +5,6 @@
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>

-#include <atomic>
-
 namespace waybar::util {

 class Rfkill : public sigc::trackable {
@@ -19,7 +17,7 @@ class Rfkill : public sigc::trackable {

 private:
  enum rfkill_type rfkill_type_;
-  std::atomic_bool state_ = false;
+  bool state_ = false;
  int fd_ = -1;

  bool on_event(Glib::IOCondition cond);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexis Rouillard	75d7b2f812	Merge pull request #4696 from luoqing510/gtk4 fix: add const qualifier to Glib::ustring formatter to fix compile error	2025-12-18 18:57:22 +01:00
luoQ	dd0f8a0ecf	fix: add const qualifier to Glib::ustring formatter to fix compile error	2025-12-13 21:51:58 +08:00
Alexis Rouillard	b54e2c16f3	Merge pull request #2927 from LukashonakV/gtk4 Gtk4. Pick up PR#2836	2024-02-19 22:42:00 +01:00
Aleksei Bavshin	b32abf9966	refactor: merge BarSurface into Bar With only one implementation left, the abstraction is no longer necessary.	2024-02-19 23:02:47 +03:00
Aleksei Bavshin	2469851865	fix(bar): use std::string for mode names `string_view` leads to UAF when reading custom mode definitions from the configuration.	2024-02-19 22:47:25 +03:00
Aleksei Bavshin	a6d33db20f	feat: add `module` class to the root elements of the modules Previously, the only way to select all the module labels was with the following kind of selector: ```css .modules-left > widget > label, .modules-center > widget > label, .modules-right > widget > label { /* ... / } ``` (and a matching block for the `box` containers). Now, this can be expressed as ```css label.module, box.module { / ... */ } ```	2024-02-19 22:26:05 +03:00
Aleksei Bavshin	5a4a1a5595	refactor(bar): use Gtk enums for position and orientation Ensure that the position and the corresponding CSS class on window are always set.	2024-02-19 22:24:08 +03:00
Aleksei Bavshin	d6d164a27d	feat!: drop RawSurfaceImpl with direct use of wlr-layer-shell BREAKING CHANGE: gtk-layer-shell is now required and unconditionally used. The corresponding config option is removed. As a part of preparation for future versions of GTK, remove an ability to use wlr-layer-shell directly. The APIs it required were dropped in GTK4, and with the menus/tooltips positioning issue being practically unsolvable it doesn't make sense to keep maintaining the code.	2024-02-17 22:00:38 +03:00
Aleksei Bavshin	8e33333c0b	chore: update gtk-layer-shell subproject to 0.8.2	2024-02-17 21:52:03 +03:00
Alex	f1abc186b2	fix: merge 🥲	2024-01-12 10:08:20 +01:00
Alex	d5bc2f3335	Merge remote-tracking branch 'luka/gtk4' into gtk4	2024-01-12 10:06:47 +01:00
Viktar Lukashonak	f8eb01def2	Clean code Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>	2024-01-08 22:48:57 +03:00
Viktar Lukashonak	158767b5b4	Drop break point Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>	2024-01-08 22:26:13 +03:00
Viktar Lukashonak	aa95c04842	Gtk4. Stylecontext Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>	2024-01-08 22:20:23 +03:00
Viktar Lukashonak	4a88cb693a	GTK4 base compilation Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>	2024-01-08 19:03:42 +03:00