Merge pull request #54 from JaKooLit/main

update from mainstream

6 files changed, 142 insertions, 14 deletions

diff --git a/config/waybar/configs/Camellia [Bottom] b/config/waybar/configs/Camellia [Bottom]
index 02118d38..a7b995c9 100644
--- a/config/waybar/configs/Camellia [Bottom]
+++ b/config/waybar/configs/Camellia [Bottom]
@@ -43,7 +43,7 @@
 	"on-click": "activate",
 	"on-scroll-up": "hyprctl dispatch workspace e+1",
 	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"persistent_workspaces":{
+	"persistent-workspaces":{
 		"1": [],
 		"2": [],
 		"3": [],
diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP]
index cb265b77..2aa21cb5 100644
--- a/config/waybar/configs/Camellia [TOP]
+++ b/config/waybar/configs/Camellia [TOP]
@@ -43,7 +43,7 @@
 	"on-click": "activate",
 	"on-scroll-up": "hyprctl dispatch workspace e+1",
 	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"persistent_workspaces":{
+	"persistent-workspaces":{
 		"1": [],
 		"2": [],
 		"3": [],
diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop
new file mode 100644
index 00000000..47df83c0
--- /dev/null
+++ b/config/waybar/configs/Def[Bottom]-Laptop
@@ -0,0 +1,67 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Bottom - Laptop### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "bottom",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+//"margin-top": 6,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"hyprland/workspaces#pacman",
+	"custom/separator#dot-line",
+	"cpu",
+	"custom/separator#dot-line", 
+	"temperature",
+	"custom/separator#dot-line", 
+	"memory",
+	"custom/separator#dot-line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/menu",
+	"custom/separator#dot-line",
+	"idle_inhibitor", 
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#dot-line",
+	"custom/light_dark",
+	"custom/separator#dot-line",	
+	"custom/lock",
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
+
+"modules-right": [
+	//"hyprland/window", 
+	"tray",
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
+	"network#speed",
+	"custom/separator#dot-line", 
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
+	"pulseaudio",
+	"custom/separator#dot-line",
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop
new file mode 100644
index 00000000..b322a75b
--- /dev/null
+++ b/config/waybar/configs/Def[TOP]-Laptop
@@ -0,0 +1,67 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Top -Laptop ### //
+{
+"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": [
+	"hyprland/workspaces#pacman",
+	"custom/separator#dot-line",
+	"cpu",
+	"custom/separator#dot-line", 
+	"temperature",
+	"custom/separator#dot-line", 
+	"memory",
+	"custom/separator#dot-line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/menu",
+	"custom/separator#dot-line",
+	"idle_inhibitor", 
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#dot-line",
+	"custom/light_dark",
+	"custom/separator#dot-line",	
+	"custom/lock",
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
+
+"modules-right": [
+	//"hyprland/window", 
+	"tray",
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
+	"network#speed",
+	"custom/separator#dot-line", 
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
+	"pulseaudio",
+	"custom/separator#dot-line",
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom]
index 8bf8ecd1..35ff7f2d 100644
--- a/config/waybar/configs/Default [Bottom]
+++ b/config/waybar/configs/Default [Bottom]
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT ### //
+// ### DEFAULT Bottom ### //
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
@@ -50,17 +50,14 @@
 	"custom/separator#dot-line",
 	"network#speed",
 	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
-	//"wireplumber", 
 	"pulseaudio#microphone",
 	"custom/separator#dot-line",
 	"keyboard-state",
 	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
 	"custom/power",
 	],
 }
diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP]
index eabaf37e..69e10467 100644
--- a/config/waybar/configs/Default [TOP]
+++ b/config/waybar/configs/Default [TOP]
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT ### //
+// ### DEFAULT - Top ### //
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
@@ -50,17 +50,14 @@
 	"custom/separator#dot-line",
 	"network#speed",
 	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
-	//"wireplumber", 
 	"pulseaudio#microphone",
 	"custom/separator#dot-line",
 	"keyboard-state",
 	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
 	"custom/power",
 	],
 }
\ No newline at end of file