waybar: update config

* dogfood mpris module
* update colors

3 files changed, 69 insertions, 44 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 7736710..7145e18 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,5 +1,5 @@
 {
-  "modules-left": ["sway/mode", "sway/workspaces", "custom/mpris"],
+  "modules-left": ["sway/mode", "sway/workspaces", "river/tags", "mpris"],
 
   "sway/workspaces": {
     "format": "{icon}",
@@ -10,32 +10,35 @@
       "__vnc": "󱒃"
     }
   },
-  // "wlr/workspaces": {
-  //   "format": "{icon}",
-  //   "format-icons": {
-  //     "m": "󰎇",
-  //     "v": "󰿏",
-  //     "g": "󰺵",
-  //     "__vnc": "󱒃"
-  //   }
-  // },
 
   "river/tags": {
     "format": ":{}",
     "num-tags": 9
   },
 
-  "custom/mpris": {
+  "mpris": {
     "max-width": 60,
-    "on-click": "playerctl play-pause",
-    "on-click-right": "playerctl next",
-    // "exec": "env YAEGI_SYSCALL=1 YAEGI_UNRESTRICTED=1 ${HOME}/.config/waybar/modules/mpris.go",
-    // "interval": "once",
-    "retart-interval": 1,
-    "exec": "${HOME}/.config/waybar/modules/mpris.sh",
-    "return-type": "json",
-    "signal": 4,
+    "format": "{player_icon} {dynamic}",
+    "format-paused": "{status_icon} <i>{dynamic}</i>",
+    "format-icons": {
+      "default": "󰲸",
+
+      "paused": "󰏤",
+      "playing": "",
+      "stopped": "",
+    }
   },
+  // "custom/mpris": {
+  //   "max-width": 60,
+  //   "on-click": "playerctl play-pause",
+  //   "on-click-right": "playerctl next",
+  //   // "exec": "env YAEGI_SYSCALL=1 YAEGI_UNRESTRICTED=1 ${HOME}/.config/waybar/modules/mpris.go",
+  //   // "interval": "once",
+  //   "retart-interval": 1,
+  //   "exec": "${HOME}/.config/waybar/modules/mpris.sh",
+  //   "return-type": "json",
+  //   "signal": 4,
+  // },
 
   // ------------------------------------------------------------------------ //
 
@@ -93,12 +96,14 @@
   "custom/timetracked": {
     "format": "{}",
     "exec": "$HOME/.config/waybar/modules/timetracked.sh",
+    "on-click": "$HOME/.config/waybar/modules/timetracked.sh on-click",
     "escape": true,
     "return-type": "json"
   },
 
   // ------------------------------------------------------------------------ //
-  "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "backlight", "custom/gamma", "pulseaudio", "network#mullvad", "network#tailscale", "network", "battery"],
+  // "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "backlight", "custom/gamma", "pulseaudio", "network#mullvad", "network#tailscale", "network", "battery"],
+  "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "custom/gamma", "pulseaudio", "network#mullvad", "network#tailscale", "network", "battery"],
 
   "tray": {
     "spacing": 10
@@ -205,7 +210,7 @@
     "tooltip-format-disconnected": "disconnected",
   },
   "network#tailscale": {
-    "interface": "tailscale*",
+    "interface": "tailscale0",
     "format": "󰌆",
     "tooltip-format": "{ifname}: {bandwidthUpBits} {bandwidthDownBits}",
     "tooltip-format-disconnected": "disconnected",
@@ -221,14 +226,12 @@
     "format-disconnected": "󰌙 ",
     "tooltip-format": "{ifname}: {ipaddr}/{cidr}\ngateway: {gwaddr}\nssid: {essid}\nsignal: {signaldBm} dbm\ndown: {bandwidthDownBits}\nup: {bandwidthUpBits}",
     "tooltip-format-disconnected": "disconnected",
-    "on-click": "doas rc-service net.wlp2s0 start",
-    "on-click-right": "doas rc-service net.wlp2s0 stop",
-    "on-click-middle": "swx -t -f iwctl",
+    "on-click": "notify-send 'Connecting...' && doas rc-service iwd start && swx -t -f iwctl",
   },
 
   "battery": {
     "states": {
-      // "good": 95,
+      "good": 95,
       "warning": 30,
       "critical": 15
     },
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index eb2810e..3ffa9c8 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -11,17 +11,17 @@
 @define-color color10 #24936e;
 @define-color color11 #f7d94c;
 @define-color color12 #2ea9df;
-@define-color color13 #986db2;
+@define-color color13 #b481bb;
 @define-color color14 #81c7d4;
 @define-color color15 #fffffb;
 
-@define-color accent #8b81c3;
+@define-color accent #8a6bbe;
 @define-color accentdarker #70649a;
 
 @define-color foreground @color07;
 @define-color background rgba(12, 12, 12, 0.96);
-@define-color dimmed #404039; /*@color05;*/
-@define-color dimmeddarker @color00;
+@define-color dimmed #5e5e5e;
+@define-color dimmeddarker #434343;
 @define-color urgent #9f353a;
 
 * {
@@ -64,7 +64,7 @@ window#waybar.hidden {
   /* border-top: 1px solid @dimmeddarker; */
   padding: 0 0.1rem;
   margin: 0 0.2rem;
-  color: #828282;
+  color: @dimmed;
 }
 
 #cpu:hover,
@@ -129,10 +129,11 @@ window#waybar.hidden {
 }
 
 #mode {
-  font-style: italic;
+  /* font-style: italic; */
   color: @background;
-  background: @color06;
-  border-top: none;
+  background: @color03;
+  margin: 3px 6px;
+  border-radius: 2px;
 }
 
 #clock {}
@@ -225,11 +226,21 @@ label:focus {
 #custom-mpris {
   color: @foreground;
 }
-#custom-mpris.playing {
+#custom-mpris.playing,
+#custom-mpris.paused {
   border-top: 1px solid @color04;
 }
 #custom-mpris.paused {
+  font-style: italic;
+}
+#mpris {
+  color: @foreground;
+}
+#mpris.playing,
+#mpris.paused {
   border-top: 1px solid @color04;
+}
+#mpris.paused {
   font-style: italic;
 }
 
diff --git a/.config/waybar/style.css.in b/.config/waybar/style.css.in
index 5735bef..406adb6 100644
--- a/.config/waybar/style.css.in
+++ b/.config/waybar/style.css.in
@@ -15,14 +15,14 @@
 @define-color color14 {{ hex .bright_cyan }};
 @define-color color15 {{ hex .bright_white }};
 
-@define-color accent {{ hex .fuji }};
-@define-color accentdarker {{ hex .futaai }};
+@define-color accent {{ hex .accent }};
+@define-color accentdarker {{ hex .accent_darker }};
 
 @define-color foreground @color07;
 @define-color background {{ rgba .bright_black 0.96 }};
-@define-color dimmed {{ hex (darker .dim_white 0.2) }}; /*@color05;*/
-@define-color dimmeddarker @color00;
-@define-color urgent {{ hex .enji }};
+@define-color dimmed {{ hex (lighter .dim_white 0.4) }};
+@define-color dimmeddarker {{ hex .dim_white }};
+@define-color urgent {{ hex .dim_red }};
 
 * {
   border: none;
@@ -64,7 +64,7 @@ window#waybar.hidden {
   /* border-top: 1px solid @dimmeddarker; */
   padding: 0 0.1rem;
   margin: 0 0.2rem;
-  color: {{ hex .hai }};
+  color: @dimmed;
 }
 
 #cpu:hover,
@@ -129,10 +129,11 @@ window#waybar.hidden {
 }
 
 #mode {
-  font-style: italic;
+  /* font-style: italic; */
   color: @background;
-  background: @color06;
-  border-top: none;
+  background: @color03;
+  margin: 3px 6px;
+  border-radius: 2px;
 }
 
 #clock {}
@@ -225,11 +226,21 @@ label:focus {
 #custom-mpris {
   color: @foreground;
 }
-#custom-mpris.playing {
+#custom-mpris.playing,
+#custom-mpris.paused {
   border-top: 1px solid @color04;
 }
 #custom-mpris.paused {
+  font-style: italic;
+}
+#mpris {
+  color: @foreground;
+}
+#mpris.playing,
+#mpris.paused {
   border-top: 1px solid @color04;
+}
+#mpris.paused {
   font-style: italic;
 }