From 1500b379c9164089b7b6f857ed74dd14860eec83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergio.lac@pm.me>
Date: Sat, 21 Sep 2024 17:45:46 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(waybar):=20networ?=
 =?UTF-8?q?k=20module?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .config/waybar/bars/bar-2.jsonc      | 2 ++
 .config/waybar/modules/network.jsonc | 6 ++++--
 .config/waybar/style.css             | 9 +++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.config/waybar/bars/bar-2.jsonc b/.config/waybar/bars/bar-2.jsonc
index 43762707..f0db478d 100644
--- a/.config/waybar/bars/bar-2.jsonc
+++ b/.config/waybar/bars/bar-2.jsonc
@@ -9,10 +9,12 @@
     "~/.config/waybar/modules/custom-notifications.jsonc",
     "~/.config/waybar/modules/hyprland-window.jsonc",
     "~/.config/waybar/modules/hyprland-workspaces.jsonc",
+    "~/.config/waybar/modules/network.jsonc",
   ],
   "modules-left": ["custom/arch", "hyprland/workspaces"],
   "modules-center": ["hyprland/window"],
   "modules-right": [
+    "network",
     "memory",
     "cpu",
     "temperature#cpu",
diff --git a/.config/waybar/modules/network.jsonc b/.config/waybar/modules/network.jsonc
index 304a60bb..b3d3edd8 100644
--- a/.config/waybar/modules/network.jsonc
+++ b/.config/waybar/modules/network.jsonc
@@ -1,12 +1,14 @@
 {
   "network": {
-    "format-wifi": " ",
-    "format-ethernet": "󰈀 ",
+    "format-wifi": "  {ifname}",
+    "format-ethernet": "󰈀 {ifname}",
     "tooltip-format-wifi": "Network: <b>{essid}</b>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>\n<span foreground='#eed49f'> {bandwidthDownBytes}</span> <span foreground='#b7bdf8'> {bandwidthUpBytes}</span>",
     "tooltip-format-ethernet": "Network: <b>{essid}</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>\n<span foreground='#eed49f'> {bandwidthDownBytes}</span> <span foreground='#b7bdf8'> {bandwidthUpBytes}</span>",
     "format-linked": "󰈀 {ifname} (No IP)",
     "format-disconnected": "󰖪 ",
     "tooltip": true,
     "interval": 2,
+    "on-click": "pypr toggle network",
+    "on-click-right": "pypr toggle wifi",
   },
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 0c625fe5..0c6776ad 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -322,11 +322,7 @@ window#waybar.hidden {
 }
 
 #network {
-  color: @mantle;
-}
-
-#network {
-  color: @mantle;
+  color: @sky;
 }
 
 #network.disconnected {
@@ -335,7 +331,8 @@ window#waybar.hidden {
 }
 
 #network.linked {
-  color: @yellow;
+  background-color: @peach;
+  color: @mantle;
 }
 
 #clock.cl2 {