Waybar Enhancements, groups, etc

4 files changed, 118 insertions, 8 deletions

diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2
index 9021f0b1..6ddab7d8 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v2
+++ b/config/waybar/configs/[TOP] Default Laptop_v2
@@ -19,7 +19,8 @@
 	"custom/menu",
 	"custom/light_dark",
 	"custom/separator#dot-line",
-	"group/motherboard",
+	"power-profiles-daemon",
+	"group/mobo_drawer",
 	"custom/separator#blank",
 	"group/laptop",
 	"custom/separator#line",
@@ -40,15 +41,15 @@
 
 "modules-right": [
 	"network#speed",
+	"group/connections",
 	"custom/separator#line",
 	"tray",
 	"mpris", 
-	"bluetooth",
 	"group/audio",
+	"custom/separator#line",
 	"keyboard-state",
 	"custom/keyboard",
 	"custom/lock",
-	"custom/separator#dot-line",
 	"custom/power",
 	],
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop_v3
new file mode 100644
index 00000000..6ddab7d8
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default Laptop_v3
@@ -0,0 +1,55 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v2 (Laptop)  - Top ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"custom/menu",
+	"custom/light_dark",
+	"custom/separator#dot-line",
+	"power-profiles-daemon",
+	"group/mobo_drawer",
+	"custom/separator#blank",
+	"group/laptop",
+	"custom/separator#line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/cava_mviz",
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#line",
+	"hyprland/workspaces#roman",
+	"custom/separator#dot-line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"group/connections",
+	"custom/separator#line",
+	"tray",
+	"mpris", 
+	"group/audio",
+	"custom/separator#line",
+	"keyboard-state",
+	"custom/keyboard",
+	"custom/lock",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default_v3
new file mode 100644
index 00000000..d32f24eb
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default_v3
@@ -0,0 +1,54 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v3  - Top ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"custom/menu",
+	"custom/light_dark",
+	"custom/separator#dot-line",
+	"power-profiles-daemon",
+	"group/mobo_drawer",
+	"custom/separator#blank",
+	"custom/separator#line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/cava_mviz",
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#line",
+	"hyprland/workspaces#roman",
+	"custom/separator#dot-line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"group/connections",
+	"custom/separator#line",
+	"tray",
+	"mpris", 
+	"group/audio",
+	"custom/separator#line",
+	"keyboard-state",
+	"custom/keyboard",
+	"custom/lock",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Simple b/config/waybar/configs/[TOP] Simple
index 505ea63f..09488c54 100644
--- a/config/waybar/configs/[TOP] Simple
+++ b/config/waybar/configs/[TOP] Simple
@@ -15,9 +15,10 @@
 
 "modules-left": [	
 	"idle_inhibitor",
+	"group/mobo_drawer",
 	"hyprland/workspaces#rw",
+	"tray",
 	"mpris", 
-	"hyprland/window"
 	],
     
 "modules-center": [
@@ -25,10 +26,9 @@
 	],
     
 "modules-right": [
-	"tray",  
-	"battery", 
-	"pulseaudio",
-	"pulseaudio#microphone",  
+	"hyprland/window",  
+	"battery",
+ 	"group/audio", 
 	"custom/power",
 	],
 }