From c0ed89e014a43c86b1d64c0fa3e46b1ff4622845 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sat, 28 Oct 2023 17:56:45 +0900
Subject: [PATCH] tweaked waybar TL and TR layouts

---
 config/waybar/configs/config-dual-TL        | 18 ++---
 config/waybar/configs/config-dual-TR        | 81 +++++++++++----------
 config/waybar/modules                       | 32 ++------
 config/waybar/style/style-default_alter.css |  3 +-
 4 files changed, 56 insertions(+), 78 deletions(-)

diff --git a/config/waybar/configs/config-dual-TL b/config/waybar/configs/config-dual-TL
index e12d381..9bf79fc 100644
--- a/config/waybar/configs/config-dual-TL
+++ b/config/waybar/configs/config-dual-TL
@@ -4,7 +4,7 @@
 "include": "~/.config/waybar/modules",
 "layer": "top",
 //"mode": "dock",
-"width": 950,
+"width": 1200,
 "exclusive": true,
 "passthrough": false,
 "position": "top",
@@ -16,25 +16,25 @@
 "margin-right": 8,
     
 "modules-left": [
-    "custom/menu",
-    "idle_inhibitor",
+    "temperature",
     "cpu", 
-    "temperature", 
     "memory",
     "disk",
     ],
     
 "modules-center": [
     //"hyprland/window",
-    "custom/lock", 
-    "custom/weather",
-]   , 
+    "custom/lock",
+    "custom/menu",
+    "idle_inhibitor",
+	],
     
 "modules-right": [
     //"network",
     //"bluetooth",
-    //"battery", 
-    //"backlight",
+	"custom/weather",
+    "battery", 
+    "backlight",
     "pulseaudio",
     //"wireplumber", 
     "pulseaudio#microphone",
diff --git a/config/waybar/configs/config-dual-TR b/config/waybar/configs/config-dual-TR
index aec60df..2ea9ce5 100644
--- a/config/waybar/configs/config-dual-TR
+++ b/config/waybar/configs/config-dual-TR
@@ -1,72 +1,73 @@
-// ### TOP and RIGHT PANEL ## //
+// ### TOP and LEFT PANEL ## //
 
 [{
 "include": "~/.config/waybar/modules",
 "layer": "top",
 //"mode": "dock",
+"width": 1200,
 "exclusive": true,
 "passthrough": false,
 "position": "top",
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
-"padding": 2,
 "margin-top": 6,
 "margin-left": 8,
 "margin-right": 8,
-
+    
 "modules-left": [
-	"cpu", 
-	"temperature", 
-	"memory",
-	],
-  
+    "temperature",
+    "cpu", 
+    "memory",
+    "disk",
+    ],
+    
 "modules-center": [
-	"hyprland/window", 
-	"custom/weather",
-	], 
-
-"modules-right": [
-	"network",
-	"bluetooth",
-	//"cava", 
-	"battery", 
-	"backlight",
-	"pulseaudio",
-	//"wireplumber", 
-	"pulseaudio#microphone",
-	"keyboard-state",
-	"custom/power",
+    //"hyprland/window",
+    "custom/lock",
+    "custom/menu",
+    "idle_inhibitor",
 	],
+    
+"modules-right": [
+    //"network",
+    //"bluetooth",
+	"custom/weather",
+    "battery", 
+    "backlight",
+    "pulseaudio",
+    //"wireplumber", 
+    "pulseaudio#microphone",
+    "keyboard-state",
+    "custom/power",
+    ],
 },
 
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
 "position": "right",
+"height": 650,
 "margin-top": 8,
 "margin-bottom": 8,
-"margin-left": 1,
-"margin-right": 8,
+"margin-left": 8,
+"margin-right": 3,
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
-"gtk-layer-shell": true,
-  
+//"gtk-layer-shell": true,
+   
 "modules-left": [
-	"custom/menu",
-	"custom/light_dark",
-	],
-
+	"hyprland/workspaces#2",     
+    ],
+    
 "modules-center": [
-	"hyprland/workspaces#2",
-	],
-
+    "clock#vertical",
+    ],
+    
 "modules-right": [
-	"idle_inhibitor",
-	"custom/lock",
-	"tray",
-	"clock#vertical",
-	],
-
+    "tray",
+    "custom/light_dark",
+    ],
+    
 }]
\ No newline at end of file
diff --git a/config/waybar/modules b/config/waybar/modules
index 9e919e3..340c3ce 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -229,7 +229,7 @@
     
 "pulseaudio": {
   "format": "{icon}",
-  "format-bluetooth": "{icon}  {volume}%",
+  "format-bluetooth": "{icon}  {volume} %",
   "format-muted": "󰖁",
   "format-icons": {
       "headphone": "",
@@ -263,8 +263,8 @@
 "temperature": {
   "interval": 10,
   "tooltip": false,
-  "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
-  //"thermal-zone": 1,
+  //"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+  "thermal-zone": 0,
   "critical-threshold": 82,
   "format-critical": "{temperatureC}°C {icon}",
   "format": "{temperatureC}°C {icon}",
@@ -444,28 +444,6 @@
   "on-click-right": "foot --title btop sh -c 'btop'",
 },
 
-"pulseaudio#vertical": {
-  "format": "{icon}",
-  "format-bluetooth": "{icon} ",
-  "format-muted": "󰖁",
-  "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-  "default": ["", "", "󰕾", ""], 
-  "ignored-sinks": ["Easy Effects Sink"],
-  },
-  "scroll-step": 5.0,
-  "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
-  "on-click-right": "pavucontrol -t 3",
-  "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-  "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
-  "smooth-scrolling-threshold": 1,
-},
-
 "pulseaudio#microphone_vertical": {
   "format": "{format_source}",
   "format-source": "󰍬",
@@ -482,8 +460,8 @@
 "temperature#vertical": {
   "interval": 10,
   "tooltip": true,
-  //"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
-  "thermal-zone": 0,
+  "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+  //"thermal-zone": 0,
   "critical-threshold": 80,
   "format-critical": "{icon}\n{temperatureC}°C",
   "format": " {icon}",
diff --git a/config/waybar/style/style-default_alter.css b/config/waybar/style/style-default_alter.css
index 1953513..cfd718e 100644
--- a/config/waybar/style/style-default_alter.css
+++ b/config/waybar/style/style-default_alter.css
@@ -238,7 +238,6 @@ label:focus {
     color: @alert;
 }
 
-#custom-light_dark,
 #pulseaudio {
     color: @accent4;
 }
@@ -278,7 +277,6 @@ label:focus {
     color: #66cc99;
 }
 
-#idle_inhibitor,
 #custom-lock {
     color: #ffa000;
 }
@@ -297,6 +295,7 @@ label:focus {
 }
 
 #idle_inhibitor {
+	color: #f9e2af;
     /*background-color: #2d3436;*/
 }