...

2 files changed, 5 insertions, 1 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index bbfc28d6..e4a93a49 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -412,6 +412,9 @@ in {
               (leaf "scroll-method" "on-button-down")
               (leaf "scroll-button" 278)
             ])
+            (plain "touch" [
+              (leaf "map-to-output" "eDP-1")
+            ])
           ])
 
           (plain "environment" (lib.mapAttrsToList leaf {
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index ef5a7a38..16769953 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -542,7 +542,7 @@ def worktime(pull_forward_cutoff, waybar, **args):
 
         return difference_string
 
-      difference = worktime.time_to_work - worktime.time_worked
+      difference = worktime.time_to_work - worktime.time_worked + sum(worktime.pull_forward.values(), start=timedelta(milliseconds=0))
       total_minutes_difference = 5 * ceil(difference / timedelta(minutes = 5))
 
       if worktime.running_entry and abs(difference) < timedelta(days = 1) and (total_minutes_difference > 0 or abs(worktime.running_entry) >= abs(difference)) :
@@ -578,6 +578,7 @@ def worktime(pull_forward_cutoff, waybar, **args):
         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_pulled_forward = timedelta()
+        worktime_no_pulled_forward.pull_forward = dict()
 
         difference_string = format_worktime(worktime)
         difference_string_no_pulled_forward = format_worktime(worktime_no_pulled_forward)