Merge branch 'development' into windowrules

9 files changed, 119 insertions, 5 deletions

diff --git a/config/waybar/configs/[BOT & Left] SouthWest b/config/waybar/configs/[BOT & Left] SouthWest
index a38db32c..adaaca6f 100644
--- a/config/waybar/configs/[BOT & Left] SouthWest
+++ b/config/waybar/configs/[BOT & Left] SouthWest
@@ -54,6 +54,7 @@
   "$HOME/.config/waybar/ModulesWorkspaces",
   "$HOME/.config/waybar/ModulesCustom",
   "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/ModulesVertical",
   ],
 "layer": "top",
 "position": "left",
@@ -73,12 +74,12 @@
     ],
     
 "modules-center": [
-    "clock#vertical",
+    "clock#vertical"
     ],
     
 "modules-right": [
-		"mpris",
-		"custom/swaync",
+	"mpris",
+	"custom/swaync",
     "tray",
     "custom/light_dark",
     ],
diff --git a/config/waybar/configs/[BOT & Right] SouthEast b/config/waybar/configs/[BOT & Right] SouthEast
index 27cc7ceb..e78e1edb 100644
--- a/config/waybar/configs/[BOT & Right] SouthEast
+++ b/config/waybar/configs/[BOT & Right] SouthEast
@@ -54,6 +54,7 @@
   "$HOME/.config/waybar/ModulesWorkspaces",
   "$HOME/.config/waybar/ModulesCustom",
   "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/ModulesVertical",
   ],
 "layer": "top",
 "position": "right",
diff --git a/config/waybar/configs/[Left] WestWing b/config/waybar/configs/[Left] WestWing
index 4fec3cd2..7b0b87c2 100644
--- a/config/waybar/configs/[Left] WestWing
+++ b/config/waybar/configs/[Left] WestWing
@@ -8,6 +8,7 @@
   "$HOME/.config/waybar/ModulesWorkspaces",
   "$HOME/.config/waybar/ModulesCustom",
   "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/ModulesVertical",
   ],
 "layer": "top",
 "position": "left",
@@ -21,7 +22,7 @@
 //"gtk-layer-shell": true,
   
 "modules-left": [
-	"clock#vertical",
+    "clock#vertical",
 	"custom/light_dark",
 ],
 
diff --git a/config/waybar/configs/[Right] EastWing b/config/waybar/configs/[Right] EastWing
index 2a3acebb..c3303c61 100644
--- a/config/waybar/configs/[Right] EastWing
+++ b/config/waybar/configs/[Right] EastWing
@@ -8,6 +8,7 @@
   "$HOME/.config/waybar/ModulesWorkspaces",
   "$HOME/.config/waybar/ModulesCustom",
   "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/ModulesVertical",
   ],
 "layer": "top",
 "position": "right",
diff --git a/config/waybar/configs/[TOP & Left] NorthWest b/config/waybar/configs/[TOP & Left] NorthWest
index c6ebf4a7..18ce0b5d 100644
--- a/config/waybar/configs/[TOP & Left] NorthWest
+++ b/config/waybar/configs/[TOP & Left] NorthWest
@@ -51,6 +51,7 @@
   "$HOME/.config/waybar/ModulesWorkspaces",
   "$HOME/.config/waybar/ModulesCustom",
   "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/ModulesVertical",
   ],
 "layer": "top",
 "position": "left",
diff --git a/config/waybar/configs/[TOP & Right] NorthEast b/config/waybar/configs/[TOP & Right] NorthEast
index ae588fb4..ebd97aef 100644
--- a/config/waybar/configs/[TOP & Right] NorthEast
+++ b/config/waybar/configs/[TOP & Right] NorthEast
@@ -51,6 +51,7 @@
   "$HOME/.config/waybar/ModulesWorkspaces",
   "$HOME/.config/waybar/ModulesCustom",
   "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/ModulesVertical",
   ],
 "layer": "top",
 "position": "right",
diff --git a/config/waybar/configs/[TOP] Default Laptop_v5 b/config/waybar/configs/[TOP] Default Laptop_v5
new file mode 100644
index 00000000..c972b1b4
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default Laptop_v5
@@ -0,0 +1,55 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v5 (Laptop)  - Top ### //
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  ],
+"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": [
+	"group/app_drawer",
+	"custom/separator#dot-line",
+	"group/mobo_drawer",
+	"custom/separator#blank",
+	"group/laptop",
+	"custom/separator#line",
+	"custom/weather",
+	"custom/separator#blank",
+	"custom/cava_mviz",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/separator#dot-line",
+	"hyprland/workspaces#rw",
+	"custom/separator#dot-line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	],
+
+"modules-right": [
+	"network#speed",
+	"group/connections",
+	"custom/separator#line",
+	"tray",
+	"mpris",
+	"clock",  
+	"group/audio",
+	"custom/separator#dot-line",
+	"group/status",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default_v4 b/config/waybar/configs/[TOP] Default_v4
index 051aa848..678c2085 100644
--- a/config/waybar/configs/[TOP] Default_v4
+++ b/config/waybar/configs/[TOP] Default_v4
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT v4 (Laptop)  - Top ### //
+// ### DEFAULT v4  - Top ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
diff --git a/config/waybar/configs/[TOP] Default_v5 b/config/waybar/configs/[TOP] Default_v5
new file mode 100644
index 00000000..3566068c
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default_v5
@@ -0,0 +1,53 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v5 - Top ### //
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  ],
+"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": [
+	"group/app_drawer",
+	"custom/separator#dot-line",
+	"group/mobo_drawer",
+	"custom/separator#line",
+	"custom/weather",
+	"custom/separator#blank",
+	"custom/cava_mviz",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/separator#dot-line",
+	"hyprland/workspaces#rw",
+	"custom/separator#dot-line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"group/connections",
+	"custom/separator#line",
+	"tray",
+	"mpris",
+	"clock", 
+	"group/audio",
+	"custom/separator#dot-line",
+	"group/status",
+	],
+}
\ No newline at end of file