yes

2 files changed, 67 insertions, 70 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 0ac556d..d56df85 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -24,11 +24,10 @@
     "wireplumber#source",
     "wireplumber#sink",
     // "custom/mouse",
-    "clock",
+    "custom/clock",
     // "custom/internet",
     "tray"
   ],
-
   "hyprland/workspaces": {
     "cursor": false,
     "disable-scroll": true,
@@ -36,13 +35,11 @@
     "on-click": "activate",
     "format": "{icon}"
   },
-
-  "custom/layout" : {
+  "custom/layout": {
     "cursor": false,
     "tooltip": false,
     "format": " []= "
   },
-
   "hyprland/window": {
     "format": "{class}: {title}",
     "rewrite": {
@@ -59,15 +56,13 @@
       "footclient: (.*)": " $1"
     }
   },
-
-  "custom/recording" : {
+  "custom/recording": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 9,
-    "exec" : "cat /tmp/recordingicon 2> /dev/null"
+    "exec": "cat /tmp/recordingicon 2> /dev/null"
   },
-
   "image#album-art": {
     "cursor": "false",
     "signal": 11,
@@ -75,27 +70,25 @@
     "exec": "rmpcover",
     "on-click": "mpc toggle"
   },
-
-  "custom/tasks" : {
+  "custom/tasks": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 26,
     "interval": 10,
-    "exec" : "sb-tasks",
+    "exec": "sb-tasks",
     "on-click": "BLOCK_BUTTON=1 sb-tasks",
     "on-click-right": "BLOCK_BUTTON=3 sb-tasks",
     "on-click-middle": "BLOCK_BUTTON=2 sb-tasks",
     "on-click-backward": "BLOCK_BUTTON=8 sb-tasks"
   },
-
-  "custom/music" : {
+  "custom/music": {
     "cursor": false,
     "tooltip": false,
     "escape": true,
     "format": "{}",
     "signal": 11,
-    "exec" : "stmusic",
+    "exec": "stmusic",
     "on-click": "BLOCK_BUTTON=1 stmusic",
     "on-click-right": "BLOCK_BUTTON=3 stmusic",
     "on-click-middle": "BLOCK_BUTTON=2 stmusic",
@@ -104,57 +97,52 @@
     "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/src/statusbar/src/stmusic.c",
     "max-length": 120
   },
-
-  "custom/packages" : {
+  "custom/packages": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 8,
-    "exec" : "sb-pacpackages",
+    "exec": "sb-pacpackages",
     "on-click": "BLOCK_BUTTON=1 sb-pacpackages",
     "on-click-right": "BLOCK_BUTTON=3 sb-pacpackages",
     "on-click-middle": "BLOCK_BUTTON=2 sb-pacpackages",
     "on-click-backward": "BLOCK_BUTTON=8 sb-pacpackages"
   },
-
-  "custom/news" : {
+  "custom/news": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 6,
-    "exec" : "sb-news",
+    "exec": "sb-news",
     "on-click": "BLOCK_BUTTON=1 sb-news; pkill -RTMIN+6 waybar",
     "on-click-right": "BLOCK_BUTTON=3 sb-news",
     "on-click-middle": "BLOCK_BUTTON=2 sb-news",
     "on-click-backward": "BLOCK_BUTTON=8 sb-news"
   },
-
-  "custom/torrent" : {
+  "custom/torrent": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 7,
     "interval": 10,
-    "exec" : "sttorrent",
+    "exec": "sttorrent",
     "on-click": "BLOCK_BUTTON=1 sttorrent",
     "on-click-right": "BLOCK_BUTTON=3 sttorrent",
     "on-click-middle": "BLOCK_BUTTON=2 sttorrent",
     "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/src/statusbar/src/sttorrent.c"
   },
-
-  "custom/weather" : {
+  "custom/weather": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 5,
-    "exec" : "stweath",
-    "interval" : 400,
+    "exec": "stweath",
+    "interval": 400,
     "on-click-right": "notify-send \" Weather module\" \"\\- Middle click to update forecast.\n: Chance of rain/snow\n: Current temperature\"",
     "on-click-middle": "WEATHERFORCEUPDATE=1 stweath",
     "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/src/statusbar/src/stweath.c"
   },
-
-  "cpu#usage" : {
+  "cpu#usage": {
     "cursor": false,
     "tooltip": false,
     "format": "{icon} {usage}%",
@@ -164,65 +152,72 @@
       "mid": 40,
       "low": 0
     },
-    "format-icons": ["󰾆", "󰾅", "󰓅"],
+    "format-icons": [
+      "󰾆",
+      "󰾅",
+      "󰓅"
+    ],
     "on-click-middle": "setsid -f \"$TERMINAL\" -e btop >/dev/null 2>&1",
     "on-click-right": "notify-send \"󰾆 CPU module\" \"\\- Shows CPU Usage.\n- Middle click to open btop.\""
   },
-
-  "cpu#bars" : {
+  "cpu#bars": {
     "cursor": false,
     "tooltip": false,
     "interval": 1,
     "format": "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}{icon16}{icon17}{icon18}{icon19}{icon20}{icon21}{icon22}{icon23}{icon24}{icon25}{icon26}{icon27}{icon28}{icon29}{icon30}{icon31}",
-    "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
+    "format-icons": [
+      "▁",
+      "▂",
+      "▃",
+      "▄",
+      "▅",
+      "▆",
+      "▇",
+      "█"
+    ],
     "on-click-middle": "setsid -f \"$TERMINAL\" -e btop >/dev/null 2>&1",
     "on-click-right": "notify-send \"󰾆 CPU module\" \"\\- Shows CPU Usage.\n- Middle click to open btop.\""
   },
-
-  "custom/memory" : {
+  "custom/memory": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 14,
-    "exec" : "stmemory",
+    "exec": "stmemory",
     "interval": 5,
     "on-click-right": "BLOCK_BUTTON=3 stmemory",
     "on-click-middle": "BLOCK_BUTTON=2 stmemory",
     "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/src/statusbar/src/stmemory.c"
   },
-
-  "custom/doppler" : {
+  "custom/doppler": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 13,
     "interval": 650,
-    "exec" : "sb-doppler",
+    "exec": "sb-doppler",
     "on-click": "BLOCK_BUTTON=1 sb-doppler",
     "on-click-right": "BLOCK_BUTTON=3 sb-doppler",
     "on-click-middle": "BLOCK_BUTTON=2 sb-doppler",
     "on-click-backward": "BLOCK_BUTTON=8 sb-doppler"
   },
-
-  "custom/mailbox" : {
+  "custom/mailbox": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 12,
-    "exec" : "stmail",
-    "interval" : 180,
+    "exec": "stmail",
+    "interval": 180,
     "on-click": "BLOCK_BUTTON=1 stmail",
     "on-click-right": "BLOCK_BUTTON=3 stmail",
     "on-click-middle": "BLOCK_BUTTON=2 stmail",
     "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/src/statusbar/src/stmail.c"
   },
-
   "network#usage": {
     "format": "{bandwidthDownBytes} {bandwidthUpBytes}",
-    "interval" : 1,
+    "interval": 1,
     "tooltip-format": "{ifname}"
   },
-
   "network#interface": {
     "format": "{ifname}",
     "format-wifi": "{essid} ({signalStrength}%) ",
@@ -234,25 +229,27 @@
     "tooltip-format-disconnected": "Disconnected"
     //"max-length": 50
   },
-
-  "custom/nettraf" : {
+  "custom/nettraf": {
     "tooltip": false,
     "cursor": false,
     "format": "{}",
     "signal": 16,
-    "exec" : "sb-nettraf",
-    "interval" : 1,
+    "exec": "sb-nettraf",
+    "interval": 1,
     "on-click": "BLOCK_BUTTON=1 sb-nettraf",
     "on-click-right": "BLOCK_BUTTON=3 sb-nettraf",
     "on-click-backward": "BLOCK_BUTTON=8 sb-nettraf"
   },
-
-  "wireplumber#sink" : {
+  "wireplumber#sink": {
     "tooltip": false,
     "cursor": false,
     "format": "{icon} {volume}%",
     "format-muted": " ",
-    "format-icons": ["", "", ""],
+    "format-icons": [
+      "",
+      "",
+      ""
+    ],
     "signal": 10,
     "interval": 30,
     "on-click": "$TERMINAL -e pulsemixer",
@@ -261,8 +258,7 @@
     "on-scroll-down": "wpctl set-volume @DEFAULT_SINK@ 1%-",
     "on-click-right": "notify-send \" Volume module\" \"\\- Shows volume  ,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
   },
-
-  "wireplumber#source" : {
+  "wireplumber#source": {
     "node-type": "Audio/Source",
     "tooltip": false,
     "cursor": false,
@@ -276,42 +272,43 @@
     "on-scroll-down": "wpctl set-volume @DEFAULT_SOURCE@ 1%-",
     "on-click-right": "notify-send \" Microphone volume module\" \"\\- Shows volume ,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
   },
-
-  "custom/mouse" : {
+  "custom/mouse": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 24,
-    "exec" : "sb-mouse",
+    "exec": "sb-mouse",
     "interval": 60,
     "on-click": "BLOCK_BUTTON=1 sb-mouse",
     "on-click-right": "BLOCK_BUTTON=3 sb-mouse",
     "on-click-middle": "pkill -RTMIN+24 waybar",
     "on-click-backward": "BLOCK_BUTTON=8 sb-mouse"
   },
-
-  "clock" : {
-    "tooltip": false,
+  "custom/clock": {
     "cursor": false,
-    "format": "{:%a %b %d %H:%M}",
+    "tooltip": false,
+    "format": "{}",
     "signal": 1,
-    "interval" : 20
+    "exec": "stclock",
+    "interval": 20,
+    "on-click": "BLOCK_BUTTON=1 stclock",
+    "on-click-right": "BLOCK_BUTTON=3 stclock",
+    "on-click-middle": "BLOCK_BUTTON=2 stclock",
+    "on-click-backward": "BLOCK_BUTTON=8 stclock"
   },
-
-  "custom/internet" : {
+  "custom/internet": {
     "cursor": false,
     "tooltip": false,
     "format": "{}",
     "signal": 4,
-    "exec" : "sb-internet",
+    "exec": "sb-internet",
     "interval": 10,
     "on-click": "BLOCK_BUTTON=1 sb-internet; pkill -RTMIN+4 waybar",
     "on-click-right": "BLOCK_BUTTON=3 sb-internet; pkill -RTMIN+4 waybar",
     "on-click-middle": "pkill -RTMIN+4 waybar",
     "on-click-backward": "BLOCK_BUTTON=8 sb-internet"
   },
-
-  "tray" : {
+  "tray": {
     "icon-size": 20,
     "spacing": 3
   }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index c790161..b261465 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -120,7 +120,7 @@ window#waybar.hidden {
     margin: 0 4px;
 }
 
-#clock {
+#custom-clock {
 	margin-right: 4px;
 }