waybar: integrate sunsetr

diff --git a/dot-config/waybar/config.jsonc b/dot-config/waybar/config.jsonc
index 9b72754042906b1c3888b53cb746bca7fef1a730..294b0a74ff4e4957f28647d8f937fbd192d1d1c0 100644 (file)
--- a/dot-config/waybar/config.jsonc
+++ b/dot-config/waybar/config.jsonc
@@ -246,8 +246,7 @@
       ]
     },
     "on-click": "~/.config/waybar/scripts/sound-source.sh",
-    "on-click-middle": "helvum",
-    "on-click-right": "pavucontrol",
+    "on-click-right": "hyprpwcenter",
     "on-scroll-up": "~/.local/bin/wp+",
     "on-scroll-down": "~/.local/bin/wp-"
   },
@@ -289,32 +288,22 @@
       "deactivated": " off"
     }
   },
-    "custom/hyprsunset-brightness": {
-        "format": "<span size='12pt'></span> {}%",
-        "on-click": "~/.config/hypr/scripts/hyprsunset.sh brightness 60 toggle",
-        "on-click-right": "hyprctl hyprsunset identity",
-        "on-scroll-up": "~/.config/hypr/scripts/hyprsunset.sh brightness +10",
-        "on-scroll-down": "~/.config/hypr/scripts/hyprsunset.sh brightness -10",
-        "exec": "~/.config/hypr/scripts/hyprsunset.sh brightness",
-        "exec-on-event": false,
-        "exec-if": "pidof hyprsunset",
-        "interval": "once",
-        "tooltip": false,
-        "signal": 3,
-    },
-  "custom/hyprsunset-temperature": {
-        "format": "<span size='12pt'>󰽥</span> {}K",
-        "on-click": "~/.config/hypr/scripts/hyprsunset.sh temperature 4500 toggle",
-        "on-click-right": "hyprctl hyprsunset identity",
-        "on-scroll-up": "~/.config/hypr/scripts/hyprsunset.sh temperature +500",
-        "on-scroll-down": "~/.config/hypr/scripts/hyprsunset.sh temperature -500",
-        "exec": "~/.config/hypr/scripts/hyprsunset.sh temperature",
-        "exec-on-event": false,
-        "exec-if": "pidof hyprsunset",
-        "interval": "once",
-        "tooltip": false,
-        "signal": 4,
+  "custom/sunsetr": {
+    "exec": "sunsetr status --json --follow | jq --unbuffered --compact-output 'if .event_type == \"preset_changed\" then {text: \"\\(.target_temp)K\", alt: .target_period, tooltip: \"Preset: \\(.to_preset // \"default\")\\nTarget: \\(.target_temp)K @ \\(.target_gamma)%\"} elif .event_type == \"state_applied\" then {text: \"\\(.current_temp)K\", alt: .period, tooltip: \"Period: \\(.period)\\nTemp: \\(.current_temp)K @ \\(.current_gamma)%\"} else empty end'",
+    "return-type": "json",
+    "format": "{icon} {text}",
+    "format-icons": {
+      "day": "󰖨",
+      "night": "",
+      "sunset": "󰖛",
+      "sunrise": "󰖜",
+      "static": "󰋙"
     },
+    "on-click": "sunsetr preset gamemode",
+    "on-click-right": "sunsetr preset night",
+    "on-scroll-up": "",
+    "on-scroll-down": "",
+  },
   "group/trayclock": {
     "orientation": "inherit",
     "modules": [
@@ -325,8 +314,8 @@
   "group/sndpwr": {
     "orientation": "inherit",
     "modules": [
-       "wireplumber",
-       "gamemode",
+        "wireplumber",
+        "gamemode",
         "power-profiles-daemon"
     ]
   },
@@ -334,8 +323,7 @@
     "orientation": "inherit",
     "modules": [
       "idle_inhibitor",
-      "custom/hyprsunset-brightness",
-      "custom/hyprsunset-temperature",
+      "custom/sunsetr",
       "hyprland/language"
     ]
   },
@@ -400,7 +388,7 @@
   "format": "{text}",
   "return-type": "json",
   "on-click": "playerctl play-pause"
-       },
+        },
   "custom/pipespacer": {
     "format": "󰇙",
     "max-length": 1,

diff --git a/dot-config/waybar/style.css b/dot-config/waybar/style.css
index 3108f4ba81001502456e5c7ccf5462958ba3fb62..7b43c63335dea373def4b6a0a471696ba2a63881 100644 (file)
--- a/dot-config/waybar/style.css
+++ b/dot-config/waybar/style.css
@@ -311,11 +311,7 @@ window#waybar {
     border: none;
 }
 
-#custom-hyprsunset-brightness,
-#custom-hyprsunset-temperature,
-#custom-gammarelay-temperature,
-#custom-gammarelay-gamma,
-#custom-gammarelay-brightness {
+#custom-sunsetr {
     padding-left: 4px;
     padding-right: 4px;
     color: @on_surface;