1 files changed, 29 insertions, 20 deletions

diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
index 79c429f8..3f1f8119 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -1,5 +1,7 @@
-{ lib, pkgs, ... }:
-{
+{ lib, config, pkgs, ... }:
+let
+  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
+in {
   config = {
     programs.waybar = {
       enable = true;
@@ -22,7 +24,7 @@
           output = [ "eDP-1" "DP-2" "DP-3" ];
           modules-left = [ "niri/workspaces" ];
           modules-center = [ "niri/window" ];
-          modules-right = [ # "custom/worktime" "custom/worktime-today"
+          modules-right = [ "custom/worktime" "custom/worktime-today"
             "custom/weather"
             "custom/keymap"
             "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "custom/mako" "clock" ];
@@ -59,7 +61,7 @@
                       text = f"<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>"  # noqa: E501
                       if is_silent:
                           text = f"<span color=\"#ffffff\">{text}</span>"
-                      print(json.dumps({'text': text}, separators=(',', ':')), flush=True)  # noqa: E501
+                      print(json.dumps({'text': text, 'tooltip': ', '.join(modes)}, separators=(',', ':')), flush=True)  # noqa: E501
 
                   async def on_properties_changed(interface_name, changed_properties, invalidated_properties):  # noqa: E501
                       if "Modes" not in invalidated_properties:
@@ -120,16 +122,16 @@
           };
           "custom/worktime" = {
             interval = 60;
-            exec = lib.getExe pkgs.worktime;
-            tooltip = false;
+            exec = "${lib.getExe pkgs.worktime} time --waybar";
+            return-type = "json";
           };
           "custom/worktime-today" = {
             interval = 60;
-            exec = "${lib.getExe pkgs.worktime} today";
-            tooltip = false;
+            exec = "${lib.getExe pkgs.worktime} today --waybar";
+            return-type = "json";
           };
           "niri/workspaces" = {
-            ignore = ["pwctl" "kpxc" "bmgr" "edit" "term"];
+            ignore = ["eff" "pwctl" "kpxc" "bmgr" "edit" "term"];
           };
           "niri/window" = {
             separate-outputs = true;
@@ -190,8 +192,8 @@
             icon-size = iconSize;
             tooltip-format = "{percent}%";
             format-icons = ["&#xf00da;" "&#xf00db;" "&#xf00dc;" "&#xf00dd;" "&#xf00de;" "&#xf00df;" "&#xf00e0;"];
-            on-scroll-up = "lightctl -d -e4 -n1 up";
-            on-scroll-down = "lightctl -d -e4 -n1 down";
+            on-scroll-up = "${swayosd-client} --brightness raise";
+            on-scroll-down = "${swayosd-client} --brightness lower";
           };
           wireplumber = {
             format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
@@ -200,9 +202,9 @@
             format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
             format-muted = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">&#xf075f;</span>";
             # ignored-sinks = ["Easy Effects Sink"];
-            on-scroll-up = "volumectl -d -u up";
-            on-scroll-down = "volumectl -d -u down";
-            on-click = "volumectl -d toggle-mute";
+            on-scroll-up = "${swayosd-client} --output-volume raise";
+            on-scroll-down = "${swayosd-client} --output-volume lower";
+            on-click = "${swayosd-client} --output-volume mute-toggle";
           };
         }
         {
@@ -241,7 +243,7 @@
 
         * {
           border: none;
-          font-family: "Fira Sans Nerd Font";
+          font-family: "Fira Sans";
           font-size: 10pt;
           min-height: 0;
         }
@@ -252,10 +254,10 @@
         }
 
         .modules-left {
-          margin-left: 8px;
+          margin-left: 12px;
         }
         .modules-right {
-          margin-right: 8px;
+          margin-right: 12px;
         }
 
         .module {
@@ -280,11 +282,12 @@
           color: @grey;
           margin: 0 5px;
         }
-        #custom-weather, #custom-worktime-today {
+        #custom-weather {
           margin-right: 3px;
         }
-        #custom-keymap, #custom-weather {
+        #custom-keymap {
           margin-left: 3px;
+          margin-right: 3px;
         }
 
         #tray {
@@ -320,6 +323,12 @@
         #idle_inhibitor.activated {
           color: @white;
         }
+        #custom-worktime.running, #custom-worktime-today.running {
+          color: @white;
+        }
+        #custom-worktime.over, #custom-worktime-today.over {
+          color: @orange;
+        }
 
         #idle_inhibitor {
           padding-top: 1px;
@@ -327,7 +336,7 @@
 
         #privacy {
           color: @red;
-          margin: -1px 2px 0px 5px;
+          margin: -1px 4px 0px 3px;
         }
         #clock {
           /* margin-right: 5px; */