From 2ae5235dd0ccba31fde53b8919ae5eb5e4186563 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 21 Feb 2025 10:33:07 +0100 Subject: ... --- accounts/gkleen@sif/niri/mako.nix | 4 ++++ overlays/worktime/worktime/__main__.py | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/accounts/gkleen@sif/niri/mako.nix b/accounts/gkleen@sif/niri/mako.nix index 0a10555a..2788fb82 100644 --- a/accounts/gkleen@sif/niri/mako.nix +++ b/accounts/gkleen@sif/niri/mako.nix @@ -27,6 +27,10 @@ [app-name=Element] group-by=summary + [app-name=poweralertd] + ignore-timeout=1 + default-timeout=2000 + [mode=silent] invisible=1 ''; diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py index 16769953..d458ffdb 100755 --- a/overlays/worktime/worktime/__main__.py +++ b/overlays/worktime/worktime/__main__.py @@ -644,14 +644,17 @@ def time_worked(now, waybar, **args): clockout_time, exact_clockout_time, clockout_difference = round_clockout_time(difference) clockout_time_pull_forward, exact_clockout_time_pull_forward, clockout_difference_pull_forward = round_clockout_time(difference_pull_forward) + clockout_pull_forward_sum = now.now + now.time_to_work - now.time_worked + sum(now.pull_forward.values(), start=timedelta(milliseconds=0)) + if now.running_entry and clockout_time and (clockout_difference >= 0 or clockout_difference_pull_forward >= 0): out_text = f"{difference_string}/{clockout_time:%H:%M}" tooltip = f"{tooltip_timedelta(worked)}/{exact_clockout_time:%H:%M:%S}" - if clockout_time_pull_forward != clockout_time: - out_text += f"…{clockout_time_pull_forward:%H:%M}" - if exact_clockout_time_pull_forward != exact_clockout_time: - tooltip += f"…{exact_clockout_time_pull_forward:%H:%M:%S}" + if clockout_pull_forward_sum > exact_clockout_time_pull_forward: + if clockout_time_pull_forward != clockout_time: + out_text += f"…{clockout_time_pull_forward:%H:%M}" + if exact_clockout_time_pull_forward != exact_clockout_time: + tooltip += f"…{exact_clockout_time_pull_forward:%H:%M:%S}" else: out_text = difference_string else: -- cgit v1.2.3