From 0e868d40341b296fceb007d77b7376d71d926c4e Mon Sep 17 00:00:00 2001
From: primardj <b00168148@mytudublin.ie>
Date: Fri, 26 Jan 2024 17:30:43 +0000
Subject: [PATCH] wifi, network, memory, change form. add htop autoopen when
 click on memory.

---
 dotconfig/waybar/config    | 16 ++++++++++------
 dotconfig/waybar/style.css | 14 ++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/dotconfig/waybar/config b/dotconfig/waybar/config
index 91e8a91..74c365f 100644
--- a/dotconfig/waybar/config
+++ b/dotconfig/waybar/config
@@ -7,7 +7,7 @@
     // Choose the order of the modules
     "modules-left": ["clock", "network", "hyprland/workspaces" ],
     "modules-center": ["hyprland/window"],
-    "modules-right": [ "pulseaudio", "backlight", "battery", "tray"], // mpd, cpu, memory, keyboard-state, temperature, idle_inhibitor
+    "modules-right": [ "memory", "pulseaudio", "backlight", "battery", "tray"], // mpd, cpu, keyboard-state, temperature, idle_inhibitor
     // Modules configuration
     "hyprland/workspaces": {
     		"disable-scroll": true,
@@ -108,7 +108,10 @@
         "tooltip": false
     },
     "memory": {
-        "format": "{}% "
+        "interval": 1,
+        // "format": "{}%  "
+        "format": " {used:0.1f}/{total:0.1f}G  {swapUsed:0.1f}/{swapTotal:0.1f}G",
+        "on-click": "alacritty --class floating -e htop -t"
     },
     "temperature": {
         // "thermal-zone": 2,
@@ -142,12 +145,13 @@
 //   },
     "network": {
         "interface": "wlan*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
+        "interval": 1,
+        "format-wifi": " {signalStrength}%", //"{essid} ({signalStrength}%) ",
         "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
+        "tooltip-format": "{essid} - {ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
         "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+        "format-alt": " {ipaddr}/{cidr}"
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
@@ -166,7 +170,7 @@
             "car": "",
             "default": ["", "", ""]
         },
-        "on-click": "pavucontrol"
+        //"on-click": "pavucontrol"
     }
 //   "custom/media": {
 //       "format": "{icon} {}",
diff --git a/dotconfig/waybar/style.css b/dotconfig/waybar/style.css
index 261c684..d625c98 100644
--- a/dotconfig/waybar/style.css
+++ b/dotconfig/waybar/style.css
@@ -90,11 +90,11 @@ window#waybar.hidden {
 
 #pulseaudio {
 	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
+	/*margin-left: 8px;*/
+	/*padding-left: 16px;*/
 	padding-right: 16px;
 	margin-bottom: 0;
-	border-radius: 26px 0px 0px 26px;
+	border-radius: 0px 0px 0px 0px;
 	transition: none;
 	/*color: #4d4d4d;*/
 	/*background: #9aedfe;*/
@@ -120,10 +120,12 @@ window#waybar.hidden {
 	padding-left: 16px;
 	padding-right: 16px;
 	margin-bottom: 0;
-	border-radius: 26px;
+	border-radius: 26px 0px 0px 26px;
 	transition: none;
-	color: #4d4d4d;
-	background: #ff6e67;
+	/*color: #4d4d4d;*/
+	/*background: #ff6e67;*/
+    color: #ff6666;
+	background: #282a36;
 }
 
 #cpu {