feat(waybar): unify wlsunset and wluma into nightlight toggle

Move the waybar toggle script from wlsunset module to waybar module,
rename it to nightlight-toggle, and add wluma service start/stop.

Author: workflow

…top/wlsunset/_scripts/wlsunset-waybar.sh …top/waybar/_scripts/nightlight-toggle.shparts/features/desktop/wlsunset/_scripts/wlsunset-waybar.sh renamed to parts/features/desktop/waybar/_scripts/nightlight-toggle.sh parts/features/desktop/wlsunset/_scripts/wlsunset-waybar.sh renamed to parts/features/desktop/waybar/_scripts/nightlight-toggle.sh

@@ -1,6 +1,8 @@
+# Toggles wlsunset (gamma) and wluma (brightness) together.
 # Originally looted from https://github.com/CyrilSLi/linux-scripts
 if pgrep -x wlsunset; then
 	killall -9 wlsunset
+	systemctl --user stop wluma.service
 else
 	RETRIES=30
 	counter=0
@@ -18,5 +20,6 @@ else
 	longitude=$(echo "$CONTENT" | jq .lon)
 	latitude=$(echo "$CONTENT" | jq .lat)
 	wlsunset -l "$latitude" -L "$longitude" &
+	systemctl --user start wluma.service
 fi
 pkill -35 waybar

parts/features/desktop/waybar/default.nix

@@ -16,6 +16,11 @@
       runtimeInputs = [pkgs.dunst pkgs.gnugrep];
       text = builtins.readFile ./_scripts/dunst-dnd-toggle.sh;
     };
+    nightlight-toggle = pkgs.writeShellApplication {
+      name = "nightlight-toggle";
+      runtimeInputs = with pkgs; [wlsunset procps killall systemd curl jq libnotify];
+      text = builtins.readFile ./_scripts/nightlight-toggle.sh;
+    };
     isNvidia = osConfig.dendrix.hasNvidia;
     isNumenor = osConfig.dendrix.hostname == "numenor";
     isFlexbox = osConfig.dendrix.hostname == "flexbox";
@@ -231,8 +236,8 @@
       "group/screens" = {
         modules =
           if isFlexbox
-          then ["backlight" "custom/wlsunset"]
-          else ["custom/ddc-backlight-left" "custom/ddc-backlight-middle" "custom/ddc-backlight-right" "custom/wlsunset"];
+          then ["backlight" "custom/nightlight"]
+          else ["custom/ddc-backlight-left" "custom/ddc-backlight-middle" "custom/ddc-backlight-right" "custom/nightlight"];
         orientation = "inherit";
       };
 
@@ -289,13 +294,13 @@
         interval = 60;
       };
 
-      "custom/wlsunset" = {
+      "custom/nightlight" = {
         interval = 1;
         exec = "if pgrep wlsunset >/dev/null 2>&1; then stdbuf -oL printf '{\"alt\": \"on\",\"class\": \"on\"}'; else stdbuf -oL printf '{\"alt\": \"off\",\"class\": \"off\"}'; fi";
-        on-click = "wlsunset-waybar";
+        on-click = "${nightlight-toggle}/bin/nightlight-toggle";
         return-type = "json";
         format = " {icon}";
-        tooltip-format = "wlsunset: {alt}";
+        tooltip-format = "wlsunset + wluma: {alt}";
         signal = 1; # SIGRTMIN+1 or 35 for updating immediately from script
         format-icons = {
           on = "";
@@ -570,7 +575,7 @@
           color: @base0B;
         }
 
-        #custom-wlsunset.off {
+        #custom-nightlight.off {
           color: @base0A;
         }
 

parts/features/desktop/wlsunset/default.nix

@@ -1,16 +1,8 @@
 # Day/night gamma adjustments for Wayland
 {...}: {
-  flake.modules.homeManager.wlsunset = {pkgs, ...}: let
-    # https://github.com/CyrilSLi/linux-scripts/blob/main/waybar/wlsunset.sh
-    wlsunset-waybar = pkgs.writeShellApplication {
-      name = "wlsunset-waybar";
-      runtimeInputs = with pkgs; [wlsunset procps killall];
-      text = builtins.readFile ./_scripts/wlsunset-waybar.sh;
-    };
-  in {
+  flake.modules.homeManager.wlsunset = {pkgs, ...}: {
     home.packages = [
       pkgs.wlsunset
-      wlsunset-waybar
     ];
   };
 }