26 files changed, 722 insertions, 233 deletions

diff --git a/overlays/changedetection-io.nix b/overlays/changedetection-io.nix
new file mode 100644
index 00000000..95e8985e
--- /dev/null
+++ b/overlays/changedetection-io.nix
@@ -0,0 +1,7 @@
+{ final, prev, ... }: {
+  changedetection-io = prev.changedetection-io.overrideAttrs (oldAttrs: {
+    propagatedBuildInputs = (oldAttrs.propagatedBuildInputs or []) ++ (with final.python3.pkgs; [
+      playwright
+    ]);
+  });
+}
diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix
index cec216e2..e0ced1e3 100644
--- a/overlays/etesync-dav.nix
+++ b/overlays/etesync-dav.nix
@@ -1,55 +1,58 @@
 { final, prev, ... }: {
-  etesync-dav = prev.python3Packages.buildPythonApplication rec {
+  etesync-dav = final.python3Packages.buildPythonApplication rec {
     pname = "etesync-dav";
-    version = "0.33.4";
+    version = "0.35.1";
+    pyproject = true;
 
     src = prev.fetchFromGitHub {
       owner = "etesync";
       repo = "etesync-dav";
-      rev = "v${version}";
-      hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE=";
+      tag = "v${version}";
+      hash = "sha256-y4BhU2kSn+RWqc5+pJQFhbwfat9cMWD0ED0EXJp25cY=";
     };
 
-    dependencies = with prev.python3Packages; [
+    build-system = with final.python3Packages; [ setuptools ];
+
+    dependencies = with final.python3Packages; [
       appdirs
       etebase
       etesync
       flask
       flask-wtf
       msgpack
-      setuptools
-      (toPythonModule (buildPythonApplication rec {
+      requests
+      requests.optional-dependencies.socks
+      (buildPythonApplication rec {
         pname = "radicale";
-        version = "3.2.3";
+        version = "3.2.0";
         pyproject = true;
 
         src = prev.fetchFromGitHub {
           owner = "Kozea";
           repo = "Radicale";
           rev = "refs/tags/v${version}";
-          hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE=";
+          hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";
         };
 
+        postPatch = ''
+          sed -i '/addopts/d' setup.cfg
+        '';
+
         build-system = [
           setuptools
         ];
 
-        dependencies =
-          [
-            defusedxml
-            passlib
-            vobject
-            pika
-            python-dateutil
-            pytz # https://github.com/Kozea/Radicale/issues/816
-          ]
-          ++ passlib.optional-dependencies.bcrypt;
+        dependencies = [
+          defusedxml
+          passlib
+          vobject
+          pika
+          python-dateutil
+          pytz # https://github.com/Kozea/Radicale/issues/816
+        ] ++ passlib.optional-dependencies.bcrypt;
 
         doCheck = false;
-      }))
-      requests
-      types-setuptools
-      requests.optional-dependencies.socks
+      })
     ];
 
     doCheck = false;
diff --git a/overlays/nftables-prometheus-exporter/nftables-prometheus-exporter.py b/overlays/nftables-prometheus-exporter/nftables-prometheus-exporter.py
index 484228c8..60ef4670 100644
--- a/overlays/nftables-prometheus-exporter/nftables-prometheus-exporter.py
+++ b/overlays/nftables-prometheus-exporter/nftables-prometheus-exporter.py
@@ -42,7 +42,7 @@ class NFTMetrics:
             cls._instance = cls.__new__(cls)
             cls._instance.attrs = None
         return cls._instance
-    
+
 
     def __init__(self):
         raise RuntimeError('Call instance() instead')
@@ -62,7 +62,7 @@ class NFTMetrics:
                 raise RuntimeError(f'nftables json schema v{version} is not supported')
             queries[query_name] = data['nftables'][1:]
 
-        
+
         def extract_query(query_name, type_name):
             return [
                 item[type_name]
@@ -98,21 +98,21 @@ class NFTMetrics:
         metrics += _format_prom_metrics('nftables_counter_packets_count', 'counter', counter_packets)
 
         map_counts = []
-        for meter in self.attrs['maps']:
+        for item in self.attrs['maps']:
             labels = {  k: v for k, v in counter.items() if k not in set(['elem']) }
-            map_counts += [(labels, len(meter['elem']))]
+            map_counts += [(labels, len(item['elem']) if 'elem' in item else 0)]
         metrics += _format_prom_metrics('nftables_map_elem_count', 'gauge', map_counts)
 
         meter_counts = []
-        for meter in self.attrs['meters']:
+        for item in self.attrs['meters']:
             labels = {  k: v for k, v in counter.items() if k not in set(['elem']) }
-            meter_counts += [(labels, len(meter['elem']))]
+            item_counts += [(labels, len(item['elem']) if 'elem' in item else 0)]
         metrics += _format_prom_metrics('nftables_meter_elem_count', 'gauge', meter_counts)
-            
+
         set_counts = []
-        for meter in self.attrs['sets']:
+        for item in self.attrs['sets']:
             labels = {  k: v for k, v in counter.items() if k not in set(['elem']) }
-            set_counts += [(labels, len(meter['elem']))]
+            set_counts += [(labels, len(item['elem']) if 'elem' in item else 0)]
         metrics += _format_prom_metrics('nftables_set_elem_count', 'gauge', set_counts)
 
         return metrics.encode('utf-8')
@@ -120,7 +120,7 @@ class NFTMetrics:
 class NFTMetricsServer(BaseHTTPRequestHandler):
     def log_message(self, format, *args):
         pass
-    
+
     def do_GET(self):
         nft_metrics = NFTMetrics.instance()
         nft_metrics.update()
@@ -138,7 +138,7 @@ class NFTMetricsServer(BaseHTTPRequestHandler):
                 self.send_response(200)
                 self.send_header("Content-type", "text/plain")
                 self.end_headers()
-                
+
                 self.wfile.write(nft_metrics.prometheus())
             case _:
                 self.send_response(404)
diff --git a/overlays/niri.nix b/overlays/niri.nix
index 9188ed7d..95a918b0 100644
--- a/overlays/niri.nix
+++ b/overlays/niri.nix
@@ -3,6 +3,7 @@
   (final: prev: {
     niri-unstable = prev.niri-unstable.overrideAttrs (oldAttrs: {
       buildInputs = (oldAttrs.buildInputs or []) ++ [ final.libgbm ];
+      doCheck = false;
     });
   })
   final prev
diff --git a/overlays/nix-output-monitor.nix b/overlays/nix-output-monitor.nix
new file mode 100644
index 00000000..a15913ef
--- /dev/null
+++ b/overlays/nix-output-monitor.nix
@@ -0,0 +1,6 @@
+{ final, prev, sources, ... }:
+{
+  nix-output-monitor = prev.nix-output-monitor.overrideAttrs (oldAttrs: prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.ghc.version "9.10.1") {
+    inherit (sources.nix-output-monitor) version src;
+  });
+}
diff --git a/overlays/postfix-mta-sts-resolver/default.nix b/overlays/postfix-mta-sts-resolver/default.nix
index 52ab2d40..c210cf79 100644
--- a/overlays/postfix-mta-sts-resolver/default.nix
+++ b/overlays/postfix-mta-sts-resolver/default.nix
@@ -11,7 +11,7 @@
       projectDir = cleanPythonSources {
         src = prev.runCommand "sources" {} ''
           mkdir $out
-          cp -r ${sources.postfix-mta-sts-resolver.src}/. $out
+          cp -r --no-preserve=all ${sources.postfix-mta-sts-resolver.src}/. $out
 
           cp ${./pyproject.toml} $out/pyproject.toml
           cp ${./poetry.lock} $out/poetry.lock
diff --git a/overlays/prometheus-lvm-exporter.nix b/overlays/prometheus-lvm-exporter.nix
index 240f8d85..72d9c7ca 100644
--- a/overlays/prometheus-lvm-exporter.nix
+++ b/overlays/prometheus-lvm-exporter.nix
@@ -3,7 +3,7 @@
     pname = "prometheus-lvm-exporter";
     inherit (sources.prometheus-lvm-exporter) version src;
 
-    vendorHash = "sha256-z/fV0PzoWSDTJ44En19o7zJPPPox5ymFw7sw0Ab9t00=";
+    vendorHash = "sha256-CoTNTCBBugbHWDsOuZY1t8HrpdmEbbSMyVb3+1u0q+g=";
 
     doCheck = false;
 
diff --git a/overlays/quickshell/default.nix b/overlays/quickshell/default.nix
new file mode 100644
index 00000000..7c4a263d
--- /dev/null
+++ b/overlays/quickshell/default.nix
@@ -0,0 +1,14 @@
+{ final, prev, sources, ... }:
+{
+  quickshell = prev.quickshell.overrideAttrs (oldAttrs: {
+    inherit (sources.quickshell) version src;
+
+    buildInputs = (oldAttrs.buildInputs or []) ++ [ final.polkit.dev ];
+
+    patches = (oldAttrs.patches or []) ++ [
+        ./lock-state-changed.patch
+        ./pipewire.patch
+        ./io.patch
+    ];
+  });
+}
diff --git a/overlays/quickshell/io.patch b/overlays/quickshell/io.patch
new file mode 100644
index 00000000..961bdcaf
--- /dev/null
+++ b/overlays/quickshell/io.patch
@@ -0,0 +1,13 @@
+diff --git i/src/io/socket.cpp w/src/io/socket.cpp
+index 371f687..d12eaeb 100644
+--- i/src/io/socket.cpp
++++ w/src/io/socket.cpp
+@@ -66,7 +66,7 @@ void Socket::onSocketDisconnected() {
+ }
+ 
+ void Socket::onSocketError(QLocalSocket::LocalSocketError error) {
+-       qCWarning(logSocket) << "Socket error for" << this << error;
++       // qCWarning(logSocket) << "Socket error for" << this << error;
+        emit this->error(error);
+ }
+ 
diff --git a/overlays/quickshell/lock-state-changed.patch b/overlays/quickshell/lock-state-changed.patch
new file mode 100644
index 00000000..4be273fa
--- /dev/null
+++ b/overlays/quickshell/lock-state-changed.patch
@@ -0,0 +1,12 @@
+diff --git i/src/wayland/session_lock.cpp w/src/wayland/session_lock.cpp
+index 0ecf9ec..3dbd19b 100644
+--- i/src/wayland/session_lock.cpp
++++ w/src/wayland/session_lock.cpp
+@@ -127,6 +127,7 @@ void WlSessionLock::realizeLockTarget(WlSessionLock* old) {
+                this->updateSurfaces(false);
+ 
+                if (!this->manager->lock()) this->lockTarget = false;
++               emit this->lockStateChanged();
+ 
+                this->updateSurfaces(true, old);
+        } else {
diff --git a/overlays/quickshell/pipewire.patch b/overlays/quickshell/pipewire.patch
new file mode 100644
index 00000000..2d98eefc
--- /dev/null
+++ b/overlays/quickshell/pipewire.patch
@@ -0,0 +1,488 @@
+diff --git i/src/services/pipewire/device.cpp w/src/services/pipewire/device.cpp
+index 616e7d0..0c55008 100644
+--- i/src/services/pipewire/device.cpp
++++ w/src/services/pipewire/device.cpp
+@@ -3,6 +3,7 @@
+ #include <cstdint>
+ #include <functional>
+ #include <utility>
++#include <algorithm>
+ 
+ #include <pipewire/device.h>
+ #include <qcontainerfwd.h>
+@@ -19,6 +20,8 @@
+ #include <spa/pod/pod.h>
+ #include <spa/pod/vararg.h>
+ #include <spa/utils/type.h>
++#include <spa/monitor/device.h>
++#include <spa/utils/keys.h>
+ 
+ #include "../../core/logcat.hpp"
+ #include "core.hpp"
+@@ -46,6 +49,25 @@ void PwDevice::unbindHooks() {
+        this->mWaitingForDevice = false;
+ }
+ 
++void PwDevice::initProps(const spa_dict* props) {
++       if (const auto* deviceName = spa_dict_lookup(props, SPA_KEY_DEVICE_NAME)) {
++               this->name = deviceName;
++       }
++
++       if (const auto* deviceDesc = spa_dict_lookup(props, SPA_KEY_DEVICE_DESCRIPTION)) {
++               this->description = deviceDesc;
++       }
++
++       if (const auto* deviceNick = spa_dict_lookup(props, SPA_KEY_DEVICE_NICK)) {
++               this->nick = deviceNick;
++       }
++
++       if (const auto* mediaClass = spa_dict_lookup(props, SPA_KEY_MEDIA_CLASS)) {
++               this->type = mediaClass;
++       }
++}
++
++
+ const pw_device_events PwDevice::EVENTS = {
+     .version = PW_VERSION_DEVICE_EVENTS,
+     .info = &PwDevice::onInfo,
+@@ -71,6 +93,11 @@ void PwDevice::onInfo(void* data, const pw_device_info* info) {
+                                }
+ 
+                                break;
++                       } else if (param.id == SPA_PARAM_EnumProfile && param.flags & SPA_PARAM_INFO_READ) {
++                               self->validProfiles.clear();
++                               pw_device_enum_params(self->proxy(), 0, param.id, 0, UINT32_MAX, nullptr);
++                       } else if (param.id == SPA_PARAM_Profile && param.flags & SPA_PARAM_INFO_READ) {
++                               pw_device_enum_params(self->proxy(), 0, param.id, 0, UINT32_MAX, nullptr);
+                        }
+                }
+        }
+@@ -97,6 +124,15 @@ void PwDevice::onParam(
+                }
+ 
+                self->addDeviceIndexPairs(param);
++       } else if (id == SPA_PARAM_EnumProfile) {
++               PwProfile profile = PwProfile::parseSpaPod(param);
++               self->profilesUpdated = true;
++               self->profiles.insertOrAssign(profile.index, profile);
++               self->validProfiles.insert(profile.index);
++       } else if (id == SPA_PARAM_Profile) {
++               PwProfile profile = PwProfile::parseSpaPod(param);
++               self->currentProfileUpdated = true;
++               self->currentProfile = profile;
+        }
+ }
+ 
+@@ -145,6 +181,21 @@ void PwDevice::polled() {
+                        return false;
+                });
+        }
++       if (this->profilesUpdated) {
++               this->profiles.removeIf([&](const std::pair<qint32, PwProfile>& entry) {
++                       return !this->validProfiles.contains(entry.first);
++               });
++               this->profilesUpdated = false;
++               QList<PwProfile> profiles = this->profiles.values();
++               std::sort(profiles.begin(), profiles.end(), [](const PwProfile& a, const PwProfile& b) { return a.index < b.index; });
++               emit this->profilesChanged(profiles);
++       }
++       if (this->currentProfileUpdated) {
++               this->currentProfileUpdated = false;
++               if (this->currentProfile) {
++                       emit this->currentProfileChanged(*this->currentProfile);
++               }
++       }
+ }
+ 
+ bool PwDevice::setVolumes(qint32 routeDevice, const QVector<float>& volumes) {
+@@ -182,6 +233,15 @@ bool PwDevice::setMuted(qint32 routeDevice, bool muted) {
+        });
+ }
+ 
++void PwDevice::setProfile(qint32 profileIndex) {
++       auto buffer = std::array<uint8_t, 1024>();
++       auto builder = SPA_POD_BUILDER_INIT(buffer.data(), buffer.size());
++       auto* pod = spa_pod_builder_add_object(&builder,
++               SPA_TYPE_OBJECT_ParamProfile, SPA_PARAM_Profile,
++               SPA_PARAM_PROFILE_index, SPA_POD_Int(profileIndex));
++       pw_device_set_param(this->proxy(), SPA_PARAM_Profile, 0, static_cast<spa_pod*>(pod));
++}
++
+ void PwDevice::waitForDevice() { this->mWaitingForDevice = true; }
+ bool PwDevice::waitingForDevice() const { return this->mWaitingForDevice; }
+ 
+@@ -222,4 +282,24 @@ bool PwDevice::setRouteProps(
+        return true;
+ }
+ 
++PwProfile PwProfile::parseSpaPod(const spa_pod* param) {
++       PwProfile profile;
++
++       const auto* indexProp = spa_pod_find_prop(param, nullptr, SPA_PARAM_PROFILE_index);
++       const auto* descProp = spa_pod_find_prop(param, nullptr, SPA_PARAM_PROFILE_description);
++       const auto* nameProp = spa_pod_find_prop(param, nullptr, SPA_PARAM_PROFILE_name);
++
++       spa_pod_get_int(&indexProp->value, &profile.index);
++
++       const char* desc_cstr = nullptr;
++       spa_pod_get_string(&descProp->value, &desc_cstr);
++       profile.description = QString(desc_cstr);
++
++       const char* name_cstr = nullptr;
++       spa_pod_get_string(&nameProp->value, &name_cstr);
++       profile.name = QString(name_cstr);
++
++       return profile;
++}
++
+ } // namespace qs::service::pipewire
+diff --git i/src/services/pipewire/device.hpp w/src/services/pipewire/device.hpp
+index 1a1f705..ee64858 100644
+--- i/src/services/pipewire/device.hpp
++++ w/src/services/pipewire/device.hpp
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <functional>
++#include <optional>
+ 
+ #include <pipewire/core.h>
+ #include <pipewire/device.h>
+@@ -17,6 +18,20 @@
+ 
+ namespace qs::service::pipewire {
+ 
++struct PwProfile {
++       Q_GADGET;
++       Q_PROPERTY(qint32 index MEMBER index)
++       Q_PROPERTY(QString description MEMBER description)
++       Q_PROPERTY(QString name MEMBER name)
++
++public:
++       qint32 index;
++       QString description;
++       QString name;
++
++       static PwProfile parseSpaPod(const spa_pod* param);
++};
++
+ class PwDevice;
+ 
+ class PwDevice: public PwBindable<pw_device, PW_TYPE_INTERFACE_Device, PW_VERSION_DEVICE> {
+@@ -25,6 +40,12 @@ class PwDevice: public PwBindable<pw_device, PW_TYPE_INTERFACE_Device, PW_VERSIO
+ public:
+        void bindHooks() override;
+        void unbindHooks() override;
++       void initProps(const spa_dict* props) override;
++
++       QString name;
++       QString description;
++       QString nick;
++       QString type;
+ 
+        bool setVolumes(qint32 routeDevice, const QVector<float>& volumes);
+        bool setMuted(qint32 routeDevice, bool muted);
+@@ -32,9 +53,16 @@ public:
+        void waitForDevice();
+        [[nodiscard]] bool waitingForDevice() const;
+ 
++       void setProfile(qint32 profileIndex);
++
++       QHash<qint32, PwProfile> profiles;
++       std::optional<PwProfile> currentProfile;
++
+ signals:
+        void deviceReady();
+        void routeVolumesChanged(qint32 routeDevice, const PwVolumeProps& volumeProps);
++       void profilesChanged(QList<PwProfile> profiles);
++        void currentProfileChanged(PwProfile profile);
+ 
+ private slots:
+        void polled();
+@@ -49,6 +77,11 @@ private:
+        QList<qint32> stagingIndexes;
+        void addDeviceIndexPairs(const spa_pod* param);
+ 
++       bool profilesUpdated = false;
++       QSet<qint32> validProfiles;
++
++       bool currentProfileUpdated = false;
++
+        bool
+        setRouteProps(qint32 routeDevice, const std::function<void*(spa_pod_builder*)>& propsCallback);
+ 
+diff --git i/src/services/pipewire/node.cpp w/src/services/pipewire/node.cpp
+index 3e68149..4721a58 100644
+--- i/src/services/pipewire/node.cpp
++++ w/src/services/pipewire/node.cpp
+@@ -145,6 +145,10 @@ void PwNode::initProps(const spa_dict* props) {
+                        this->type = PwNodeType::VideoSink;
+                } else if (strcmp(mediaClass, "Video/Source") == 0) {
+                        this->type = PwNodeType::VideoSource;
++               } else if (strcmp(mediaClass, "Stream/Output/Video") == 0) {
++                       this->type = PwNodeType::VideoOutStream;
++               } else if (strcmp(mediaClass, "Stream/Input/Video") == 0) {
++                       this->type = PwNodeType::VideoInStream;
+                }
+        }
+ 
+diff --git i/src/services/pipewire/node.hpp w/src/services/pipewire/node.hpp
+index 0d4c92e..ee6f223 100644
+--- i/src/services/pipewire/node.hpp
++++ w/src/services/pipewire/node.hpp
+@@ -144,6 +144,8 @@ public:
+                // This is equivalent to the media class `Video/Sink` and is composed of the
+                // @@PwNodeType.Video and @@PwNodeType.Sink flags.
+                VideoSink = Video | Sink,
++               VideoOutStream = Video | Sink | Stream,
++               VideoInStream = Video | Source | Stream,
+        };
+        Q_ENUM(Flag);
+        Q_DECLARE_FLAGS(Flags, Flag);
+diff --git i/src/services/pipewire/qml.cpp w/src/services/pipewire/qml.cpp
+index 9efb17e..921d12a 100644
+--- i/src/services/pipewire/qml.cpp
++++ w/src/services/pipewire/qml.cpp
+@@ -9,6 +9,9 @@
+ #include <qtypes.h>
+ #include <qvariant.h>
+ 
++#include <cstdint>
++#include <algorithm>
++
+ #include "../../core/model.hpp"
+ #include "connection.hpp"
+ #include "defaults.hpp"
+@@ -54,6 +57,12 @@ Pipewire::Pipewire(QObject* parent): QObject(parent) {
+ 
+        QObject::connect(&connection->registry, &PwRegistry::nodeAdded, this, &Pipewire::onNodeAdded);
+ 
++       for (auto* device: connection->registry.devices.values()) {
++               this->onDeviceAdded(device);
++       }
++
++       QObject::connect(&connection->registry, &PwRegistry::deviceAdded, this, &Pipewire::onDeviceAdded);
++
+        for (auto* link: connection->registry.links.values()) {
+                this->onLinkAdded(link);
+        }
+@@ -123,6 +132,19 @@ void Pipewire::onNodeRemoved(QObject* object) {
+        this->mNodes.removeObject(iface);
+ }
+ 
++ObjectModel<PwDeviceIface>* Pipewire::devices() { return &this->mDevices; }
++
++void Pipewire::onDeviceAdded(PwDevice* device) {
++       auto* iface = PwDeviceIface::instance(device);
++       QObject::connect(iface, &QObject::destroyed, this, &Pipewire::onDeviceRemoved);
++       this->mDevices.insertObject(iface);
++}
++
++void Pipewire::onDeviceRemoved(QObject* object) {
++       auto* iface = static_cast<PwDeviceIface*>(object); // NOLINT
++       this->mDevices.removeObject(iface);
++}
++
+ ObjectModel<PwLinkIface>* Pipewire::links() { return &this->mLinks; }
+ 
+ void Pipewire::onLinkAdded(PwLink* link) {
+@@ -357,6 +379,8 @@ QVariantMap PwNodeIface::properties() const {
+ 
+ PwNodeAudioIface* PwNodeIface::audio() const { return this->audioIface; }
+ 
++PwDeviceIface* PwNodeIface::device() const { return PwDeviceIface::instance(this->mNode->device); }
++
+ PwNodeIface* PwNodeIface::instance(PwNode* node) {
+        if (node == nullptr) return nullptr;
+ 
+@@ -481,4 +505,42 @@ void PwObjectTracker::objectDestroyed(QObject* object) {
+        emit this->objectsChanged();
+ }
+ 
++PwDeviceIface::PwDeviceIface(PwDevice* device): PwObjectIface(device), mDevice(device) {
++       QObject::connect(device, &PwDevice::profilesChanged, this, &PwDeviceIface::deviceProfilesChanged);
++       QObject::connect(device, &PwDevice::currentProfileChanged, this, &PwDeviceIface::deviceCurrentProfileChanged);
++}
++
++void PwDeviceIface::deviceProfilesChanged(QList<PwProfile>) { emit this->profilesChanged(); }
++void PwDeviceIface::deviceCurrentProfileChanged(PwProfile) { emit this->currentProfileChanged(); }
++
++quint32 PwDeviceIface::id() const { return this->mDevice->id; }
++QString PwDeviceIface::name() const { return this->mDevice->name; }
++QString PwDeviceIface::description() const { return this->mDevice->description; }
++QString PwDeviceIface::nickname() const { return this->mDevice->nick; }
++QString PwDeviceIface::type() const { return this->mDevice->type; }
++QList<PwProfile> PwDeviceIface::profiles() const {
++       QList<PwProfile> profiles = this->mDevice->profiles.values();
++       std::sort(profiles.begin(), profiles.end(), [](const PwProfile& a, const PwProfile& b) { return a.index < b.index; });
++       return profiles;
++}
++qint32 PwDeviceIface::currentProfile() const { return this->mDevice->currentProfile->index; }
++
++PwDeviceIface* PwDeviceIface::instance(PwDevice* device) {
++       if (device == nullptr) return nullptr;
++
++       auto v = device->property("iface");
++       if (v.canConvert<PwDeviceIface*>()) {
++               return v.value<PwDeviceIface*>();
++       }
++
++       auto* instance = new PwDeviceIface(device);
++       device->setProperty("iface", QVariant::fromValue(instance));
++
++       return instance;
++}
++
++void PwDeviceIface::setProfile(qint32 profileIndex) {
++       this->mDevice->setProfile(profileIndex);
++}
++
+ } // namespace qs::service::pipewire
+diff --git i/src/services/pipewire/qml.hpp w/src/services/pipewire/qml.hpp
+index e3489a1..e5e1891 100644
+--- i/src/services/pipewire/qml.hpp
++++ w/src/services/pipewire/qml.hpp
+@@ -12,11 +12,13 @@
+ #include "../../core/model.hpp"
+ #include "link.hpp"
+ #include "node.hpp"
++#include "device.hpp"
+ #include "registry.hpp"
+ 
+ namespace qs::service::pipewire {
+ 
+ class PwNodeIface;
++class PwDeviceIface;
+ class PwLinkIface;
+ class PwLinkGroupIface;
+ 
+@@ -65,6 +67,8 @@ class Pipewire: public QObject {
+        /// - @@PwNode.audio - if non null the node is an audio node.
+        QSDOC_TYPE_OVERRIDE(ObjectModel<qs::service::pipewire::PwNodeIface>*);
+        Q_PROPERTY(UntypedObjectModel* nodes READ nodes CONSTANT);
++       QSDOC_TYPE_OVERRIDE(ObjectModel<qs::service::pipewire::PwDeviceIface>*);
++       Q_PROPERTY(UntypedObjectModel* devices READ devices CONSTANT);
+        /// All links present in pipewire.
+        ///
+        /// Links connect pipewire nodes to each other, and can be used to determine
+@@ -134,6 +138,7 @@ public:
+        explicit Pipewire(QObject* parent = nullptr);
+ 
+        [[nodiscard]] ObjectModel<PwNodeIface>* nodes();
++       [[nodiscard]] ObjectModel<PwDeviceIface>* devices();
+        [[nodiscard]] ObjectModel<PwLinkIface>* links();
+        [[nodiscard]] ObjectModel<PwLinkGroupIface>* linkGroups();
+ 
+@@ -159,7 +164,9 @@ signals:
+ 
+ private slots:
+        void onNodeAdded(PwNode* node);
++       void onDeviceAdded(PwDevice* node);
+        void onNodeRemoved(QObject* object);
++       void onDeviceRemoved(QObject* object);
+        void onLinkAdded(PwLink* link);
+        void onLinkRemoved(QObject* object);
+        void onLinkGroupAdded(PwLinkGroup* group);
+@@ -167,6 +174,7 @@ private slots:
+ 
+ private:
+        ObjectModel<PwNodeIface> mNodes {this};
++       ObjectModel<PwDeviceIface> mDevices {this};
+        ObjectModel<PwLinkIface> mLinks {this};
+        ObjectModel<PwLinkGroupIface> mLinkGroups {this};
+ };
+@@ -315,6 +323,7 @@ class PwNodeIface: public PwObjectIface {
+        /// > [!NOTE] The node may be used before it is fully bound, but some data
+        /// > may be missing or incorrect.
+        Q_PROPERTY(bool ready READ isReady NOTIFY readyChanged);
++       Q_PROPERTY(qs::service::pipewire::PwDeviceIface* device READ device CONSTANT);
+        QML_NAMED_ELEMENT(PwNode);
+        QML_UNCREATABLE("PwNodes cannot be created directly");
+ 
+@@ -332,6 +341,7 @@ public:
+        [[nodiscard]] PwNodeType::Flags type() const;
+        [[nodiscard]] QVariantMap properties() const;
+        [[nodiscard]] PwNodeAudioIface* audio() const;
++       [[nodiscard]] PwDeviceIface* device() const;
+ 
+        static PwNodeIface* instance(PwNode* node);
+ 
+@@ -344,6 +354,44 @@ private:
+        PwNodeAudioIface* audioIface = nullptr;
+ };
+ 
++class PwDeviceIface: public PwObjectIface {
++       Q_OBJECT;
++       Q_PROPERTY(quint32 id READ id CONSTANT);
++       Q_PROPERTY(QString name READ name CONSTANT);
++       Q_PROPERTY(QString description READ description CONSTANT);
++       Q_PROPERTY(QString nickname READ nickname CONSTANT);
++       Q_PROPERTY(QString type READ type CONSTANT);
++       Q_PROPERTY(QList<PwProfile> profiles READ profiles NOTIFY profilesChanged);
++       Q_PROPERTY(qint32 currentProfile READ currentProfile NOTIFY currentProfileChanged);
++
++       QML_NAMED_ELEMENT(PwDevice);
++       QML_UNCREATABLE("PwDevices cannot be created directly");
++
++signals:
++       void profilesChanged();
++       void currentProfileChanged();
++
++public:
++       explicit PwDeviceIface(PwDevice* node);
++
++       [[nodiscard]] quint32 id() const;
++       [[nodiscard]] QString name() const;
++       [[nodiscard]] QString description() const;
++       [[nodiscard]] QString nickname() const;
++       [[nodiscard]] QString type() const;
++       QList<PwProfile> profiles() const;
++       qint32 currentProfile() const;
++
++       Q_INVOKABLE void setProfile(qint32 profileIndex);
++
++       static PwDeviceIface* instance(PwDevice* node);
++private:
++       PwDevice* mDevice;
++
++       void deviceProfilesChanged(QList<PwProfile> profiles);
++       void deviceCurrentProfileChanged(PwProfile profile);
++};
++
+ ///! A connection between pipewire nodes.
+ /// Note that there is one link per *channel* of a connection between nodes.
+ /// You usually want @@PwLinkGroup.
+diff --git i/src/services/pipewire/registry.cpp w/src/services/pipewire/registry.cpp
+index c08fc1d..50c6d7a 100644
+--- i/src/services/pipewire/registry.cpp
++++ w/src/services/pipewire/registry.cpp
+@@ -196,6 +196,7 @@ void PwRegistry::onGlobal(
+                device->initProps(props);
+ 
+                self->devices.emplace(id, device);
++               emit self->deviceAdded(device);
+        }
+ }
+ 
+@@ -211,6 +212,9 @@ void PwRegistry::onGlobalRemoved(void* data, quint32 id) {
+        } else if (auto* node = self->nodes.value(id)) {
+                self->nodes.remove(id);
+                node->safeDestroy();
++       } else if (auto* device = self->devices.value(id)) {
++               self->devices.remove(id);
++               device->safeDestroy();
+        }
+ }
+ 
+diff --git i/src/services/pipewire/registry.hpp w/src/services/pipewire/registry.hpp
+index 8473f04..87e0766 100644
+--- i/src/services/pipewire/registry.hpp
++++ w/src/services/pipewire/registry.hpp
+@@ -132,6 +132,7 @@ public:
+ 
+ signals:
+        void nodeAdded(PwNode* node);
++       void deviceAdded(PwDevice* node);
+        void linkAdded(PwLink* link);
+        void linkGroupAdded(PwLinkGroup* group);
+        void metadataAdded(PwMetadata* metadata);
diff --git a/overlays/spice-record.nix b/overlays/spice-record.nix
index 06a114da..2d37079b 100644
--- a/overlays/spice-record.nix
+++ b/overlays/spice-record.nix
@@ -8,5 +8,7 @@
       wrapProgram $out/bin/spice-record \
         --prefix PATH : ${prev.lib.makeBinPath (with prev; [ ffmpeg-full ])}
     '';
+    pyproject = true;
+    build-system = [ prev.python3Packages.setuptools ];
   };
 }
diff --git a/overlays/spm/default.nix b/overlays/spm/default.nix
index ff135279..bd81ef82 100644
--- a/overlays/spm/default.nix
+++ b/overlays/spm/default.nix
@@ -4,10 +4,11 @@ let
     # defaultPackages = (import ./stackage.nix {});
     # haskellPackages = defaultPackages // argumentPackages;
     # haskellPackages = argumentPackages;
-    haskellPackages = final.haskell.packages.ghc96.override {
+    haskellPackages = final.haskell.packages.ghc912.override {
       overrides = self: super: {
         warp-systemd = final.haskell.lib.doJailbreak (super.warp-systemd.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = false; }; }));
         unliftio-pool = final.haskell.lib.doJailbreak super.unliftio-pool;
+        cryptonite = super.cryptonite.overrideAttrs (oldAttrs: { doCheck = false; });
       #    servant-server = super.servant-server.overrideAttrs (oldAttrs: {
       #      patches = [];
       #    });
diff --git a/overlays/spm/lib/Spm/Api.hs b/overlays/spm/lib/Spm/Api.hs
index 8285cc55..3c22bfb6 100644
--- a/overlays/spm/lib/Spm/Api.hs
+++ b/overlays/spm/lib/Spm/Api.hs
@@ -21,7 +21,6 @@ import Data.Text (Text)
 import qualified Data.Text as Text
 
 import GHC.Generics (Generic)
-import Type.Reflection (Typeable)
 
 import Control.Lens
 
@@ -62,7 +61,7 @@ instance FromHttpApiData SpmStyle where
 
 
 newtype SpmMailbox = SpmMailbox { unSpmMailbox :: CI Text }
-  deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving stock (Eq, Ord, Read, Show, Generic)
   deriving newtype (MimeRender PlainText)
 makeWrapped ''SpmMailbox
 
@@ -70,7 +69,7 @@ instance MimeRender JSON SpmMailbox where
   mimeRender p mbox = mimeRender p $ JSON.object [ "mailbox" JSON..= unSpmMailbox mbox ]
 
 newtype SpmDomain = SpmDomain { unSpmDomain :: CI Text }
-  deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving stock (Eq, Ord, Read, Show, Generic)
   deriving newtype (MimeRender PlainText)
 makeWrapped ''SpmDomain
 
@@ -79,17 +78,17 @@ instance MimeRender JSON SpmDomain where
 
 newtype SpmLocal = SpmLocal
   { unSpmLocal :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (ToJSON, FromJSON)
 makeWrapped ''SpmLocal
 newtype SpmExtension = SpmExtension
   { unSpmExtension :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (ToJSON, FromJSON)
 makeWrapped ''SpmExtension
 
 data SpmMappingState = Valid | Reject
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic)
 instance MimeRender PlainText SpmMappingState where
   mimeRender p = mimeRender @_ @Text p . \case
     Valid -> "valid"
@@ -109,15 +108,15 @@ _SpmMappingStateReject = iso toReject fromReject
 data SpmMappingListingItem = SpmMappingListingItem
   { smlMapping :: SpmMapping
   , smlState :: SpmMappingState
-  } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving (Eq, Ord, Read, Show, Generic)
 
 newtype SpmMappingListing = SpmMappingListing { unSpmMappingListing :: [SpmMappingListingItem] }
-  deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving stock (Eq, Ord, Read, Show, Generic)
 
 data SpmMapping = SpmMapping
   { spmMappingLocal :: Maybe SpmLocal
   , spmMappingExtension :: Maybe SpmExtension
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
 
 _SpmMappingText :: Iso' SpmMapping Text
 _SpmMappingText = iso toText fromText
@@ -170,7 +169,7 @@ instance ToJSON SpmMappingListing where
 data SpmJWTClaims = SpmJWTClaims
   { spmjwtStdClaims :: ClaimsSet
   , spmjwtLocal :: SpmLocal
-  } deriving stock (Eq, Show, Generic, Typeable)
+  } deriving stock (Eq, Show, Generic)
 
 makeLensesFor [("spmjwtStdClaims", "_stdClaims"), ("spmjwtLocal", "_spmjwtLocal")] ''SpmJWTClaims
 
diff --git a/overlays/spm/server/Spm/Server.hs b/overlays/spm/server/Spm/Server.hs
index 8e7f8786..dc334729 100644
--- a/overlays/spm/server/Spm/Server.hs
+++ b/overlays/spm/server/Spm/Server.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
 {-# LANGUAGE OverloadedStrings #-}
 
 module Spm.Server
@@ -24,7 +26,6 @@ import Data.Attoparsec.Text
 import qualified Data.ByteString.Lazy as LBS
 
 import GHC.Generics (Generic)
-import Type.Reflection (Typeable)
 
 import Control.Applicative
 import Control.Monad
@@ -101,7 +102,7 @@ hSslClientSDn = "SSL-Client-S-DN"
 data SSLClientVerify
   = SSLClientVerifySuccess
   | SSLClientVerifyOther Text
-  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving (Eq, Ord, Read, Show, Generic)
 instance FromHttpApiData SSLClientVerify where
   parseUrlPiece = (left Text.pack .) . parseOnly $ p <* endOfInput
     where
@@ -163,7 +164,7 @@ data ServerCtxError
   | ServerCtxNoCredentialsDirectory
   | ServerCtxJwkSetDecodeError String
   | ServerCtxJwkSetEmpty
-  deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving stock (Eq, Ord, Read, Show, Generic)
   deriving anyclass (Exception)
 
 mkSpmApp :: (MonadUnliftIO m, MonadThrow m) => m Application
diff --git a/overlays/spm/server/Spm/Server/Ctx.hs b/overlays/spm/server/Spm/Server/Ctx.hs
index 18452a0a..1d228043 100644
--- a/overlays/spm/server/Spm/Server/Ctx.hs
+++ b/overlays/spm/server/Spm/Server/Ctx.hs
@@ -11,7 +11,6 @@ import Database.Persist.Postgresql
 import UnliftIO.Pool
 import Control.Lens.TH
 
-import Type.Reflection (Typeable)
 import GHC.Generics (Generic)
 
 
@@ -19,6 +18,6 @@ data ServerCtx = ServerCtx
   { _sctxSqlPool :: Pool SqlBackend
   , _sctxInstanceId :: UUID
   , _sctxJwkSet :: JWKSet
-  } deriving (Generic, Typeable)
+  } deriving (Generic)
 makeLenses ''ServerCtx
 
diff --git a/overlays/spm/server/Spm/Server/Database.hs b/overlays/spm/server/Spm/Server/Database.hs
index 3156e920..4405452f 100644
--- a/overlays/spm/server/Spm/Server/Database.hs
+++ b/overlays/spm/server/Spm/Server/Database.hs
@@ -13,7 +13,6 @@ import Database.Persist.Sql
 import Database.Persist.TH
 
 import GHC.Generics (Generic)
-import Type.Reflection (Typeable)
 
 import Data.Text (Text)
 
@@ -33,22 +32,22 @@ import Web.HttpApiData
 
 newtype MailMailbox = MailMailbox
   { unMailMailbox :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailMailbox
 newtype MailLocal = MailLocal
   { unMailLocal :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailLocal
 newtype MailExtension = MailExtension
   { unMailExtension :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailExtension
 newtype MailDomain = MailDomain
   { unMailDomain :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailDomain
 
diff --git a/overlays/swayosd/default.nix b/overlays/swayosd/default.nix
deleted file mode 100644
index b4601a03..00000000
--- a/overlays/swayosd/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ final, prev, sources, ... }: {
-  swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec {
-    inherit (sources.swayosd) version src;
-    cargoDeps = prev.rustPlatform.fetchCargoVendor {
-      inherit (oldAttrs) pname;
-      inherit version src;
-      hash = "sha256-yWybf4GKxHrk4WrW5SmjfPD0Gv79tpXOwNLlWeykYy0=";
-    };
-    patches = (oldAttrs.patches or []) ++ [
-      ./exponential.patch
-    ];
-  });
-}
diff --git a/overlays/swayosd/exponential.patch b/overlays/swayosd/exponential.patch
deleted file mode 100644
index eb90d739..00000000
--- a/overlays/swayosd/exponential.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/brightness_backend/brightnessctl.rs b/src/brightness_backend/brightnessctl.rs
-index ccb0e11..740fdb6 100644
---- a/src/brightness_backend/brightnessctl.rs
-+++ b/src/brightness_backend/brightnessctl.rs
-@@ -107,10 +107,21 @@ impl VirtualDevice {
-                }
-        }
- 
--       fn set_percent(&mut self, mut val: u32) -> anyhow::Result<()> {
--               val = val.clamp(0, 100);
--               self.current = self.max.map(|max| val * max / 100);
--               let _: String = self.run(("set", &*format!("{val}%")))?;
-+        fn val_to_percent(&mut self, val: u32) -> u32 {
-+                return ((val as f64 / self.get_max() as f64).powf(0.25) * 100_f64).round() as u32;
-+        }
-+        fn percent_to_val(&mut self, perc: u32) -> u32 {
-+                return ((perc as f64 / 100_f64).powf(4_f64) * self.get_max() as f64).round() as u32;
-+        }
-+
-+       fn set_percent(&mut self, val: u32) -> anyhow::Result<()> {
-+                let new = self.percent_to_val(val);
-+                self.set_val(new)
-+       }
-+       fn set_val(&mut self, val: u32) -> anyhow::Result<()> {
-+                let curr = val.clamp(0, self.get_max());
-+                self.current = Some(curr);
-+               let _: String = self.run(("set", &*format!("{curr}")))?;
-                Ok(())
-        }
- }
-@@ -134,20 +145,18 @@ impl BrightnessBackend for BrightnessCtl {
- 
-        fn lower(&mut self, by: u32) -> anyhow::Result<()> {
-                let curr = self.get_current();
--               let max = self.get_max();
--
--               let curr = curr * 100 / max;
-+                let mut new = self.device.val_to_percent(curr).saturating_sub(by);
-+                new = self.device.percent_to_val(new).min(curr.saturating_sub(1));
- 
--               self.device.set_percent(curr.saturating_sub(by))
-+               self.device.set_val(new)
-        }
- 
-        fn raise(&mut self, by: u32) -> anyhow::Result<()> {
-                let curr = self.get_current();
--               let max = self.get_max();
--
--               let curr = curr * 100 / max;
-+                let mut new = self.device.val_to_percent(curr) + by;
-+                new = self.device.percent_to_val(new).max(curr + 1);
- 
--               self.device.set_percent(curr + by)
-+               self.device.set_val(new)
-        }
- 
-        fn set(&mut self, val: u32) -> anyhow::Result<()> {
diff --git a/overlays/uucp/default.nix b/overlays/uucp/default.nix
deleted file mode 100644
index 4189dbcc..00000000
--- a/overlays/uucp/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ final, prev, ... }: {
-  uucp = prev.uucp.overrideAttrs (oldAttrs: {
-    configureFlags = (oldAttrs.configureFlags or []) ++ ["--with-newconfigdir=/etc/uucp"];
-    patches = (oldAttrs.patches or []) ++ [
-      ./mailprogram.patch
-    ];
-    NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE or ""} -Wno-error=incompatible-pointer-types";
-  });
-}
diff --git a/overlays/uucp/mailprogram.patch b/overlays/uucp/mailprogram.patch
deleted file mode 100644
index 89ac8f31..00000000
--- a/overlays/uucp/mailprogram.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- policy.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/policy.h b/policy.h
-index 5afe34b..8e92c8b 100644
---- a/policy.h
-+++ b/policy.h
-@@ -240,7 +240,7 @@
-    the sendmail choice below.  Otherwise, select one of the other
-    choices as appropriate.  */
- #if 1
--#define MAIL_PROGRAM "/usr/lib/sendmail -t"
-+#define MAIL_PROGRAM "${config.security.wrapperDir}/sendmail -t"
- /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
- #define MAIL_PROGRAM_TO_BODY 1
- #define MAIL_PROGRAM_SUBJECT_BODY 1
diff --git a/overlays/waybar.nix b/overlays/waybar.nix
deleted file mode 100644
index e7e3b807..00000000
--- a/overlays/waybar.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions
-  flakeInputs.waybar.overlays.default
-  (final: prev: {
-    waybar = prev.waybar.overrideAttrs (oldAttrs: {
-      dontVersionCheck = true;
-    });
-  })
-  final prev
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index bf24bbec..ffeb1b84 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -375,10 +375,7 @@ class Worktime(object):
                               parse_datestr(stripped_line)
 
                           for day in [fromDay + timedelta(days = x) for x in range(0, (toDay - fromDay).days + 1)]:
-                              if self.end_date.date() < day or day < self.start_date.date():
-                                  continue
-
-                              if self.would_be_workday(day):
+                              if self.would_be_workday(day) and self.start_date.date() <= day and day <= self.end_date.date():
                                   if excused_kind == 'leave':
                                       self.leave_days.add(day)
                                   elif time is not None and time >= self.time_per_day(day):
@@ -393,9 +390,29 @@ class Worktime(object):
       start_day = self.start_date.date()
       end_day = self.end_date.date()
 
+      self.extra_days_to_work = dict()
+
       try:
-          with open(Path(config_dir) / "pull-forward", 'r') as excused:
-              for line in excused:
+          with open(Path(config_dir) / "days-to-work", 'r') as extra_days_to_work_file:
+              for line in extra_days_to_work_file:
+                  stripped_line = line.strip()
+                  if stripped_line:
+                      splitLine = stripped_line.split(' ')
+                      if len(splitLine) == 2:
+                          [hours, datestr] = splitLine
+                          day = datetime.strptime(datestr, date_format).replace(tzinfo=tzlocal()).date()
+                          self.extra_days_to_work[day] = timedelta(hours = float(hours))
+                      else:
+                          day = datetime.strptime(stripped_line, date_format).replace(tzinfo=tzlocal()).date()
+                          self.extra_days_to_work[day] = self.time_per_day(day)
+      except IOError as e:
+          if e.errno != 2:
+              raise e
+
+
+      try:
+          with open(Path(config_dir) / "pull-forward", 'r') as pull_forward:
+              for line in pull_forward:
                   stripped_line = line.strip()
                   if stripped_line:
                       [hours, datestr] = stripped_line.split(' ')
@@ -416,15 +433,22 @@ class Worktime(object):
                                   if not d == datetime.strptime(c, date_format).replace(tzinfo=tzlocal()).date(): break
                           else:
                               if d >= self.end_date.date():
-                                  self.pull_forward[d] = min(timedelta(hours = float(hours)), self.time_per_day(d) - (holidays[d] if d in holidays else timedelta()))
+                                  time_for_day = self.time_per_day(d) if d.isoweekday() in self.workdays else timedelta()
+                                  if d in self.extra_days_to_work:
+                                      time_for_day += self.extra_days_to_work[d]
+                                  self.pull_forward[d] = min(timedelta(hours = float(hours)), time_for_day)
       except IOError as e:
           if e.errno != 2:
               raise e
 
+      if self.pull_forward:
+          for year in range(self.end_date.year + 1, max(self.pull_forward.keys()).year + 1):
+              holidays |= {k: v * timedelta(hours = hours_per_week(k)) / len(self.workdays) for k, v in Worktime.holidays(year).items()}
+
       self.days_to_work = dict()
 
-      if self.pull_forward:
-          end_day = max(end_day, max(list(self.pull_forward)))
+      # if self.pull_forward:
+      #     end_day = max(end_day, max(self.pull_forward.keys()))
 
       for day in [start_day + timedelta(days = x) for x in range(0, (end_day - start_day).days + 1)]:
           if day.isoweekday() in self.workdays:
@@ -432,26 +456,6 @@ class Worktime(object):
               if time_to_work > timedelta():
                 self.days_to_work[day] = time_to_work
 
-      self.extra_days_to_work = dict()
-
-      try:
-          with open(Path(config_dir) / "days-to-work", 'r') as extra_days_to_work_file:
-              for line in extra_days_to_work_file:
-                  stripped_line = line.strip()
-                  if stripped_line:
-                      splitLine = stripped_line.split(' ')
-                      if len(splitLine) == 2:
-                          [hours, datestr] = splitLine
-                          day = datetime.strptime(datestr, date_format).replace(tzinfo=tzlocal()).date()
-                          self.extra_days_to_work[day] = timedelta(hours = float(hours))
-                      else:
-                          day = datetime.strptime(stripped_line, date_format).replace(tzinfo=tzlocal()).date()
-                          self.extra_days_to_work[day] = self.time_per_day(day)
-      except IOError as e:
-          if e.errno != 2:
-              raise e
-
-
       self.now_is_workday = self.is_workday(self.now.date())
 
       self.time_worked = timedelta()
@@ -467,9 +471,9 @@ class Worktime(object):
 
       self.time_to_work = sum([self.days_to_work[day] for day in self.days_to_work.keys() if day <= self.end_date.date()], timedelta())
       for day in [d for d in list(self.pull_forward) if d > self.end_date.date()]:
-          days_forward = set([d for d in self.days_to_work.keys() if d >= self.end_date.date() and d < day and (not d in self.pull_forward or d == self.end_date.date())])
-          extra_days_forward = set([d for d in self.extra_days_to_work.keys() if d >= self.end_date.date() and d < day and (not d in self.pull_forward or d == self.end_date.date())])
-          days_forward = days_forward.union(extra_days_forward)
+          days_forward = set([d for d in [start_day + timedelta(days = x) for x in range(0, (day - start_day).days + 1)] if d >= self.end_date.date() and d < day and (d not in self.pull_forward or d == self.end_date.date())])
+          extra_days_forward = set([d for d in self.extra_days_to_work.keys() if d >= self.end_date.date() and d < day and (d not in self.pull_forward or d == self.end_date.date())])
+          days_forward |= extra_days_forward
 
           extra_day_time_left = timedelta()
           for extra_day in extra_days_forward:
@@ -482,15 +486,28 @@ class Worktime(object):
                 day_time = max(timedelta(), self.time_per_day(extra_day) - self.extra_days_to_work[extra_day])
                 self.extra_days_to_work[extra_day] += extra_day_time * (day_time / extra_day_time_left)
 
-          hours_per_day_forward = time_forward / len(days_forward) if len(days_forward) > 0 else timedelta()
+          def days_count(days_forward):
+              r = 0
+              for day in sorted(days_forward):
+                  day_time = timedelta()
+                  if day in self.extra_days_to_work:
+                      day_time += self.extra_days_to_work[day]
+                  if day in holidays and not day in self.extra_days_to_work:
+                      day_time -= holidays[day]
+                  if day.isoweekday() in self.workdays:
+                      day_time += timedelta(hours = hours_per_week(day)) / len(self.workdays)
+                  r += max(timedelta(), day_time) / (timedelta(hours = hours_per_week(day)) / len(self.workdays))
+              return r
+
+          hours_per_day_forward = time_forward / days_count(days_forward) if days_count(days_forward) > 0 else timedelta()
           days_forward.discard(self.end_date.date())
 
-          self.time_pulled_forward += time_forward - hours_per_day_forward * len(days_forward)
+          self.time_pulled_forward += time_forward - hours_per_day_forward * days_count(days_forward)
 
       if self.end_date.date() in self.extra_days_to_work:
           self.time_pulled_forward += self.extra_days_to_work[self.end_date.date()]
 
-      self.time_to_work += self.time_pulled_forward
+      # self.time_to_work += self.time_pulled_forward
 
       self.time_worked += api.get_billable_hours(self.start_date, self.now)
 
@@ -569,7 +586,7 @@ def worktime(pull_forward_cutoff, waybar, **args):
     pull_forward_sum = sum(worktime.pull_forward.values(), start=timedelta(milliseconds=0))
     if pull_forward_sum >= min(pull_forward_cutoff, timedelta(seconds = 1)):
         worktime_no_pulled_forward = deepcopy(worktime)
-        worktime_no_pulled_forward.time_to_work -= worktime_no_pulled_forward.time_pulled_forward
+        # worktime_no_pulled_forward.time_to_work -= worktime_no_pulled_forward.time_pulled_forward
         worktime_no_pulled_forward.time_pulled_forward = timedelta()
         worktime_no_pulled_forward.pull_forward = dict()
         worktime.time_to_work += pull_forward_sum
@@ -607,7 +624,7 @@ def time_worked(now, waybar, **args):
     out_text = None
     out_class = "running" if now.running_entry else "stopped"
     tooltip = tooltip_timedelta(worked)
-    target_time = max(then.time_per_day(then.now.date()), now.time_per_day(now.now.date())) if then.time_per_day(then.now.date()) and now.time_per_day(now.now.date()) else (then.time_per_day(then.now.date()) if then.time_per_day(then.now.date()) else now.time_per_day(now.now.date()));
+    target_time = max(then.time_per_day(then.now.date()), now.time_per_day(now.now.date())) if then.time_per_day(then.now.date()) and now.time_per_day(now.now.date()) else (then.time_per_day(then.now.date()) if then.time_per_day(then.now.date()) else now.time_per_day(now.now.date()))
     difference = target_time - worked
     difference_pull_forward = difference + now.time_pulled_forward
     if now.running_entry and difference_pull_forward < timedelta(seconds=0):
diff --git a/overlays/yt-dlp.nix b/overlays/yt-dlp.nix
index 94ab1fdd..1c9f77d8 100644
--- a/overlays/yt-dlp.nix
+++ b/overlays/yt-dlp.nix
@@ -1,5 +1,13 @@
-{ prev, sources, ... }: {
+{ prev, final, sources, ... }: {
   yt-dlp = prev.yt-dlp.overrideAttrs (oldAttrs: {
     inherit (sources.yt-dlp) pname version src;
   });
+  python3 = prev.python3.override {
+    packageOverrides = python-self: python-super: {
+      yt-dlp-ejs = python-super.yt-dlp-ejs.overridePythonAttrs (oldAttrs: {
+        inherit (sources.yt-dlp-ejs) pname version src;
+      });
+    };
+  };
+  python3Packages = final.python3.pkgs;
 }
diff --git a/overlays/zte-prometheus-exporter/default.nix b/overlays/zte-prometheus-exporter/default.nix
index cd4207cd..6295567d 100644
--- a/overlays/zte-prometheus-exporter/default.nix
+++ b/overlays/zte-prometheus-exporter/default.nix
@@ -1,7 +1,7 @@
 { final, prev, ... }:
 let
   packageOverrides = final.callPackage ./python-packages.nix {};
-  inpPython = final.python310.override { inherit packageOverrides; };
+  inpPython = final.python3.override { inherit packageOverrides; };
   python = inpPython.withPackages (ps: with ps; [pytimeparse requests]);
 in {
   zte-prometheus-exporter = prev.stdenv.mkDerivation rec {
diff --git a/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py b/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py
index fc719a96..1d150eda 100644
--- a/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py
+++ b/overlays/zte-prometheus-exporter/zte-prometheus-exporter.py
@@ -54,13 +54,13 @@ class ZTEMetrics:
             cls._instance.password = environ.get('ZTE_PASSWORD')
             cls._instance.attrs = None
         return cls._instance
-    
+
 
     def __init__(self):
         raise RuntimeError('Call instance() instead')
 
-    _error_pattern = re.compile('^IF_ERROR(PARAM|TYPE|STR|ID)$')
-    _obj_pattern = re.compile('^(?:OBJ_(.+)_ID)|(?:ID_(WAN_COMFIG))$')
+    _error_pattern = re.compile(r'^IF_ERROR(PARAM|TYPE|STR|ID)$')
+    _obj_pattern = re.compile(r'^(?:OBJ_(.+)_ID)|(?:ID_(WAN_COMFIG))$')
     def update(self):
         attrs = dict()
 
@@ -106,6 +106,8 @@ class ZTEMetrics:
                                     value = child.text
                                 case _:
                                     pass
+                            if value == '0,0':
+                                value = '0'
                             if not name is None and not value is None:
                                 instance_dict[name] = value
                                 name = None
@@ -120,11 +122,21 @@ class ZTEMetrics:
     def json_text(self):
         return json.dumps(self.attrs)
 
-    _link_pattern = re.compile('^IGD\.WD1\.LINE([0-9]+)$')
-    _eth_pattern = re.compile('^IGD\.LD1\.ETH([0-9]+)$')
+    _link_pattern = re.compile(r'^IGD\.WD1\.LINE([0-9]+)$')
+    _eth_pattern = re.compile(r'^IGD\.LD1\.ETH([0-9]+)$')
     def prometheus(self):
         metrics = ''
 
+        metrics += _format_prom_metrics('info', 'gauge', [({
+            "version_date": self.attrs['DEVINFO']['IGD']['VerDate'],
+            "software_version": self.attrs['DEVINFO']['IGD']['SoftwareVer'],
+            "model_name": self.attrs['DEVINFO']['IGD']['ModelName'],
+            "model_firmware_version": self.attrs['DEVINFO']['IGD']['ModelFirmwareVer'],
+            "hardware_version": self.attrs['DEVINFO']['IGD']['HardwareVer'],
+            "serial_number": self.attrs['DEVINFO']['IGD']['SerialNumber'],
+            "boot_version": self.attrs['DEVINFO']['IGD']['BootVer'],
+        }, 1)], 'Metadata about a given ZTE device')
+
         uptime_seconds = timeparse(self.attrs['SYSTEMYIME']['IGD']['systemTime'])
         metrics += _format_prom_metrics('uptime_seconds', 'gauge', [({}, uptime_seconds)], 'Seconds device has been running')
 
@@ -133,34 +145,44 @@ class ZTEMetrics:
             link_match = self._link_pattern.match(link)
             link_number = link_match.group(1)
 
-            if 'crc_errors_count' not in link_metrics:
-                link_metrics['crc_errors_count'] = {'type': 'counter', 'metrics': []}
-            link_metrics['crc_errors_count']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['UpCrc_errors']))]
-            link_metrics['crc_errors_count']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['DownCrc_errors']))]
-
-            if 'noise_margin_db' not in link_metrics:
-                link_metrics['noise_margin_db'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['noise_margin_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_noise_margin']))]
-            link_metrics['noise_margin_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_noise_margin']))]
-
-            if 'attenuation_db' not in link_metrics:
-                link_metrics['attenuation_db'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['attenuation_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_attenuation']))]
-            link_metrics['attenuation_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_attenuation']))]
-
-            if 'max_rate_kbps' not in link_metrics:
-                link_metrics['max_rate_kbps'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['max_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_max_rate']))]
-            link_metrics['max_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_max_rate']))]
-
-            if 'current_rate_kbps' not in link_metrics:
-                link_metrics['current_rate_kbps'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['current_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_current_rate']))]
-            link_metrics['current_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_current_rate']))]
-
-            if 'dsl_uptime_seconds' not in link_metrics:
-                link_metrics['dsl_uptime_seconds'] = {'type': 'gauge', 'metrics': []}
-            link_metrics['dsl_uptime_seconds']['metrics'] += [({"link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Showtime_start']))]
+            link_is_up = self.attrs['DSLINTERFACE'][link]['Status'] == 'Up'
+
+            if link_is_up:
+                if 'crc_errors_count' not in link_metrics:
+                    link_metrics['crc_errors_count'] = {'type': 'counter', 'metrics': []}
+                link_metrics['crc_errors_count']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['UpCrc_errors']))]
+                link_metrics['crc_errors_count']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['DownCrc_errors']))]
+
+                if 'noise_margin_db' not in link_metrics:
+                    link_metrics['noise_margin_db'] = {'type': 'gauge', 'metrics': []}
+                link_metrics['noise_margin_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_noise_margin']) / 10)]
+                link_metrics['noise_margin_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_noise_margin']) / 10)]
+
+                if 'attenuation_db' not in link_metrics:
+                    link_metrics['attenuation_db'] = {'type': 'gauge', 'metrics': []}
+                link_metrics['attenuation_db']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_attenuation']) / 10)]
+                link_metrics['attenuation_db']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_attenuation']) / 10)]
+
+                if 'max_rate_kbps' not in link_metrics:
+                    link_metrics['max_rate_kbps'] = {'type': 'gauge', 'metrics': []}
+                link_metrics['max_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_max_rate']))]
+                link_metrics['max_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_max_rate']))]
+
+                if 'current_rate_kbps' not in link_metrics:
+                    link_metrics['current_rate_kbps'] = {'type': 'gauge', 'metrics': []}
+                link_metrics['current_rate_kbps']['metrics'] += [({"direction": "up", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Upstream_current_rate']))]
+                link_metrics['current_rate_kbps']['metrics'] += [({"direction": "down", "link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Downstream_current_rate']))]
+
+            if 'uptime_seconds' not in link_metrics:
+                link_metrics['uptime_seconds'] = {'type': 'gauge', 'metrics': []}
+            link_metrics['uptime_seconds']['metrics'] += [({"link": link_number}, int(self.attrs['DSLINTERFACE'][link]['Showtime_start']) if link_is_up else 0)]
+
+            if 'status' not in link_metrics:
+                link_metrics['status'] = {'type': 'gauge', 'metrics': []}
+            up_status, *status = self.attrs['DSLINTERFACE'][link]['Status'].split(',')
+            down_status = up_status if not status else status[0]
+            link_metrics['status']['metrics'] += [({"link": link_number, "direction": "up", "status": up_status}, 1)]
+            link_metrics['status']['metrics'] += [({"link": link_number, "direction": "down", "status": down_status}, 1)]
         if link_metrics:
             for metric_name in link_metrics:
                 metrics += _format_prom_metrics(f'dsl_{metric_name}', link_metrics[metric_name]['type'], link_metrics[metric_name]['metrics'])
@@ -203,7 +225,7 @@ class ZTEMetricsServer(BaseHTTPRequestHandler):
                 self.send_response(200)
                 self.send_header("Content-type", "text/plain")
                 self.end_headers()
-                
+
                 self.wfile.write(zte_metrics.prometheus())
             case _:
                 self.send_response(404)