Merge pull request #300 from JaKooLit/development

Pre-release stage: Development to Main

7 files changed, 181 insertions, 26 deletions

diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek
index 10b62db6..b1cfc1ae 100644
--- a/config/waybar/configs/[BOT] Sleek
+++ b/config/waybar/configs/[BOT] Sleek
@@ -14,23 +14,31 @@
 "modules-left": [
 	"custom/menu",
 	"custom/separator#blank_2",
-	"mpris", 
-	"hyprland/window"
+	"hyprland/workspaces",
+	"custom/separator#blank_2",
+	"mpris",
+	"tray"
 ],
 
-"modules-center": [		
-	"hyprland/workspaces"	
+"modules-center": [
+	"idle_inhibitor",
+	"custom/separator#blank",
+	"clock",
+	"custom/separator#blank",
+	"custom/swaync"
 ],
 		
 "modules-right": [
-	"tray",
-	"custom/swaync",
+	"hyprland/window",
+	"custom/separator#blank",
+	"custom/separator#blank", 
 	"pulseaudio",
-	"clock",
-	"custom/power"				
+	"custom/separator#blank",
+	"custom/power",					
 	],
 
 
+
 // Additional format / customize modules
 
 "custom/power": {
diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit
index 62cb449d..6e9cac28 100644
--- a/config/waybar/configs/[TOP & BOT] SummitSplit
+++ b/config/waybar/configs/[TOP & BOT] SummitSplit
@@ -24,8 +24,8 @@
 	],
   
 "modules-center": [
-	"idle_inhibitor", 
-	"hyprland/workspaces#4", 
+	"idle_inhibitor",
+	"clock",  
 	"custom/light_dark",
 	], 
 
@@ -35,7 +35,7 @@
 	"backlight",
 	"bluetooth",
 	"network",
-	//"custom/updater",
+	"custom/updater",
 	"custom/cycle_wall",
 	"custom/lock", 
 	],
@@ -54,6 +54,7 @@
 "height": 0,
 "margin-left": 8,
 "margin-right": 8,
+//"gtk-layer-shell": true,
 //"margin-bottom": 0,
 
 "modules-left": [
@@ -62,7 +63,7 @@
 	 ],
 
 "modules-center": [
-	"clock", 
+	"hyprland/workspaces#rw", 
 	],
 
 "modules-right": [
@@ -75,6 +76,5 @@
 	//"wireplumber", 
 	"pulseaudio#microphone",	  
 	"custom/power",
-	],
-
-}]
\ No newline at end of file
+	],  
+}],
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
new file mode 100644
index 00000000..09488c54
--- /dev/null
+++ b/config/waybar/configs/[TOP] Simple
@@ -0,0 +1,35 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+// ### TOP Simple ## //
+
+{
+"include": "~/.config/waybar/modules",
+"layer": "top", 
+"position": "top", 
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"gtk-layer-shell": true,
+"margin-left": 6,
+"margin-right": 6,
+"margin-top": 2,
+
+"modules-left": [	
+	"idle_inhibitor",
+	"group/mobo_drawer",
+	"hyprland/workspaces#rw",
+	"tray",
+	"mpris", 
+	],
+    
+"modules-center": [
+	"clock#2"
+	],
+    
+"modules-right": [
+	"hyprland/window",  
+	"battery",
+ 	"group/audio", 
+	"custom/power",
+	],
+}
+
diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek
index dbd8a7e0..fda6aca2 100644
--- a/config/waybar/configs/[TOP] Sleek
+++ b/config/waybar/configs/[TOP] Sleek
@@ -13,21 +13,23 @@
 "modules-left": [
 	"custom/menu",
 	"custom/separator#blank_2",
-	"clock",
+	"hyprland/workspaces",
 	"custom/separator#blank_2",
-	"hyprland/window"
+	"mpris",
+	"tray"
 ],
 
-"modules-center": [		
-	"hyprland/workspaces"	
+"modules-center": [
+	"idle_inhibitor",
+	"custom/separator#blank",
+	"clock",
+	"custom/separator#blank",
+	"custom/swaync"
 ],
 		
 "modules-right": [
-	"custom/swaync",
-	"custom/separator#blank",
-	"tray",
+	"hyprland/window",
 	"custom/separator#blank",
-	"mpris",
 	"custom/separator#blank", 
 	"pulseaudio",
 	"custom/separator#blank",