upd

3 files changed, 98 insertions, 14 deletions

diff --git a/.config/waybar/config.json b/.config/waybar/config.json
index 581d763..8d32834 100644
--- a/.config/waybar/config.json
+++ b/.config/waybar/config.json
@@ -5,20 +5,20 @@
   "reload_style_on_change": true,
   "modules-left": [
     "hyprland/workspaces",
-    "custom/vanity",
     "hyprland/window"
   ],
   "modules-right": [
+    "custom/test",
     "custom/recording",
     "custom/tasks",
     "custom/music",
     "custom/packages",
     "custom/news",
     "custom/torrent",
+    "cpu",
     "custom/memory",
     "custom/forecast",
     "custom/mailbox",
-    "custom/nettraf",
     "custom/microphone",
     "custom/volume",
     "custom/clock",
@@ -33,9 +33,12 @@
     "format": "{icon}"
   },
 
-  "custom/vanity" : {
+  "custom/test" : {
     "tooltip": false,
-    "format": "[]="
+    "format": "{}",
+    "signal": 101,
+    "exec" : "/home/awy/test.sh",
+    "return-type": "json"
   },
 
   "custom/recording" : {
@@ -105,6 +108,18 @@
     "on-click-backward": "BLOCK_BUTTON=8 sb-torrent"
   },
 
+  "cpu" : {
+    "tooltip": false,
+    "format": "{icon} {usage}%",
+    "interval": 1,
+    "states": {
+      "high": 70,
+      "mid": 40,
+      "low": 0
+    },
+    "format-icons": ["󰾆", "󰾅", "󰓅"]
+  },
+
   "custom/memory" : {
     "tooltip": false,
     "format": "{}",
@@ -153,6 +168,24 @@
     "on-click-backward": "BLOCK_BUTTON=8 sb-mailbox"
   },
 
+  "network#usage": {
+    "format": "{bandwidthDownBytes} {bandwidthUpBytes}",
+    "interval" : 1,
+    "tooltip-format": "{ifname}"
+  },
+
+  "network#interface": {
+    "format": "{ifname}",
+    "format-wifi": "{essid} ({signalStrength}%) ",
+    "format-ethernet": "{ifname} ",
+    "format-disconnected": "",
+    "tooltip-format": "{ifname}",
+    "tooltip-format-wifi": "{essid} ({signalStrength}%) ",
+    "tooltip-format-ethernet": "{ifname} ",
+    "tooltip-format-disconnected": "Disconnected",
+    //"max-length": 50
+  },
+
   "custom/nettraf" : {
     "tooltip": false,
     "format": "{}",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index ff119b0..80b90d5 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,15 +1,19 @@
+@import "theme.css";
+
 * {
 	font-family: "monospace";
 	min-height: 0;
+  font-weight: bold;
 	font-size: 100%;
+  color: #cdd6f4;
 }
 
 window#waybar {
-  background-color: #005577;
+  /* background-color: #005577; */
 }
 
 #window {
-  background-color: #005577;
+  /* background-color: #005577; */
   padding-left: 10px;
 }
 
@@ -20,24 +24,24 @@ window#waybar {
 
 #taskbar button,
 #workspaces button {
-  color: #bbb;
-  background-color: #222;
+  /* color: #bbb; */
+  /* background-color: #222; */
   border-radius: 0px;
 }
 
 #taskbar button.active,
 #workspaces button.active {
-	color: #eee;
-  background-color: #005577;
+	/* color: #eee; */
+	/*  background-color: #005577; */
 }
 
 #workspaces button.urgent {
-	color: #fb4934;
+	/* color: #fb4934; */
 }
 
 .modules-left, .modules-right {
-	background: #222;
-  color: #bbb;
+	/* background: #222; */
+  /* color: #bbb; */
 }
 
 .modules-right {
@@ -45,7 +49,12 @@ window#waybar {
 }
 
 #window {
-  color: #fff;
+  /* color: #fff; */
+}
+
+#custom-test {
+  color: green;
+  padding-right: 10px;
 }
 
 #custom-music {
@@ -60,6 +69,22 @@ window#waybar {
   padding-right: 10px;
 }
 
+#cpu {
+  padding-right: 10px;
+}
+
+#cpu.high {
+  color: @red;
+}
+
+#cpu.mid {
+  color: @yellow;
+}
+
+#cpu.low {
+  color: @green;
+}
+
 #custom-memory {
   padding-right: 10px;
 }
diff --git a/.config/waybar/theme.css b/.config/waybar/theme.css
new file mode 100644
index 0000000..0eb6a82
--- /dev/null
+++ b/.config/waybar/theme.css
@@ -0,0 +1,26 @@
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color mauve #cba6f7;
+@define-color red #f38ba8;
+@define-color maroon #eba0ac;
+@define-color peach #fab387;
+@define-color yellow #f9e2af;
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color text #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color base #1e1e2e;
+@define-color mantle #181825;
+@define-color crust #11111b;