Merge pull request #23 from JaKooLit/waybar

New Waybar flavours!

18 files changed, 535 insertions, 239 deletions

diff --git a/config/waybar/configs/config-Bottom-Left b/config/waybar/configs/Bottom-Left
index da0bc68f..da0bc68f 100644
--- a/config/waybar/configs/config-Bottom-Left
+++ b/config/waybar/configs/Bottom-Left
diff --git a/config/waybar/configs/config-Bottom-Right b/config/waybar/configs/Bottom-Right
index a715706b..a715706b 100644
--- a/config/waybar/configs/config-Bottom-Right
+++ b/config/waybar/configs/Bottom-Right
diff --git a/config/waybar/configs/Camellia b/config/waybar/configs/Camellia
new file mode 100644
index 00000000..aa5a41a9
--- /dev/null
+++ b/config/waybar/configs/Camellia
@@ -0,0 +1,162 @@
+//* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+//* ............................................*/
+//* .............CAMELLIA.......................*/
+//* ............................................*/
+//* --- 👍 designed by https://github.com/Krautt  👍 --- */
+
+{
+ 
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "bottom",
+"spacing": 0,
+"fixed-center": false,
+"ipc": true,
+//"margin-top": 0,
+"margin-bottom": 0,
+"margin-left": 0,
+"margin-right": 0,
+	
+"modules-left": ["hyprland/workspaces#cam","custom/separator#line","tray#cam", "wlr/taskbar"],
+
+"modules-center": ["hyprland/window#cam"], 
+	
+"modules-right": ["custom/backlight","backlight/slider","custom/speaker","pulseaudio/slider","battery#cam","clock#cam", "network#cam"],
+
+// M O D U L E S //
+
+"hyprland/workspaces#cam": {
+	"active-only":false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"persistent_workspaces":{
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": []
+	},
+		"format-icons": {
+		"1": "Uno",
+		"2": "Due",
+		"3": "Tre",
+		"4": "Quattro",
+		"5": "Cinque",
+		"6":"Sei",
+		"7":"Sette",
+		"8":"Otto",
+		"9":"Nove",
+		"10":"Dieci"
+	}	
+},
+
+"hyprland/window#cam": {
+	"format": " {title}",
+	"max-length": 50,
+	"rewrite": {
+		"(.*) — Mozilla Firefox": " $1",
+		"(.*) - zsh": "> [$1]"
+},
+		"separate-outputs": true
+},
+
+"clock#cam": {
+	"interval": 60,
+	"format": "{:%A, %H:%M %p}",
+	"max-length": 25,
+	
+},
+
+"battery#cam": {
+	"interval": 60,
+	"align": 0,
+	"rotate": 0,
+	//"bat": "BAT1",
+	//"adapter": "ACAD",
+	"full-at": 100,
+	"design-capacity": false,
+	"states": {
+	  "critical": 15
+			 },
+	"format": "{capacity}% {icon}",
+	"format-charging": " {capacity}%",
+	"format-plugged": "󱘖 {capacity}%",
+	"format-full": "{icon} Full",
+	"format-alt": "{icon} {time}",
+	"format-icons": ["", "", "", "", ""],
+	"format-time": "{H}h {M}min",
+	"tooltip": true,
+	"tooltip-format": "{timeTo} {power}w"
+},
+
+"pulseaudio/slider": {
+	"min": 0,
+	"max": 100,
+	"orientation": "horizontal"
+	
+},
+
+"custom/speaker": {
+	"exec": "echo '🔊'",  
+	"interval": 1,
+	"format": "{}"
+},
+
+"backlight/slider": {
+	"min": 0,
+	"max": 100,
+	"orientation": "horizontal",
+	"device": "intel_backlight"
+},
+
+"custom/backlight": {
+	"exec": "echo '✨'",  
+	"interval": 1,
+	"format": "{}"
+},
+
+"tray#cam": {
+	"icon-size": 16,
+	"spacing": 10
+},
+
+"network#cam": {
+	"format": "{ifname}",
+	"format-wifi": "{icon}",
+	"format-ethernet": "󰌘",
+	"format-disconnected": "󰌙", 
+	"tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
+	"format-linked": "󰈁 {ifname} (No IP)",
+	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
+	"tooltip-format-ethernet": "{ifname} 󰌘",
+	"tooltip-format-disconnected": "󰌙 Disconnected",
+	"max-length": 50,
+	"format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
+},
+
+"wlr/taskbar": {
+	"format": "{icon}",
+	"icon-size": 14,
+	"icon-theme": "Numix-Circle",
+	"tooltip-format": "{title}",
+	"on-click": "activate",
+	"on-click-middle": "close",
+	"ignore-list": [
+	    "kitty"
+		],
+		"app_ids-mapping": {
+		  "firefoxdeveloperedition": "firefox-developer-edition"
+		},
+		"rewrite": {
+			"Firefox Web Browser": "Firefox",
+			"Foot Server": "Terminal"
+		}
+}
+}
\ No newline at end of file
diff --git a/config/waybar/configs/Chrysanthemum b/config/waybar/configs/Chrysanthemum
new file mode 100644
index 00000000..598a666f
--- /dev/null
+++ b/config/waybar/configs/Chrysanthemum
@@ -0,0 +1,114 @@
+//* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+//* ............................................*/
+//* .............CHRYSANTHEMUM.......................*/
+//* ............................................*/
+//* --- 👍 designed by https://github.com/Krautt  👍 --- */
+
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 5,
+"fixed-center": false,
+"ipc": true,
+"margin-top": 0,
+//"margin-bottom": 5,
+	
+"modules-left": ["clock#gar","tray"],
+  
+"modules-center": ["hyprland/workspaces#gar"], 
+	
+"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
+
+// M O D U L E S //
+
+"hyprland/workspaces#gar": {
+  "active-only": false,
+  "all-outputs": true, 
+  "format": "{icon}",
+  "show-special": false,
+  "on-click": "activate",
+  "on-scroll-up": "hyprctl dispatch workspace e+1",
+  "on-scroll-down": "hyprctl dispatch workspace e-1",
+     "persistent_workspaces": {
+      "1": [],
+      "2": [],
+      "3": [],
+      "4": [],
+      "5": [],
+},
+    "format-icons": {
+      "active": "",
+      "default": "",
+    }
+},
+
+"clock#gar": {
+	"format": "{:%a %d | %H:%M}",
+	"format-alt": "{:%A, %d %B, %Y (%R)}"
+},
+
+"hyprland/window#gar": {
+  "format": "{}",
+  "max-length": 60
+},
+
+"tray#gar": {
+  "icon-size": 15,
+  "spacing": 10
+},
+
+"pulseaudio#gar": {
+  "format": "{icon} {volume}%",
+  "format-bluetooth": "{icon} {volume}%",
+  "format-bluetooth-muted": " {icon}",
+  "format-muted": "󰸈",
+  "format-icons": {
+    "headphone": "",
+    "hands-free": "",
+    "headset": "",
+    "phone": "",
+    "portable": "",
+    "car": "",
+    "default": ["", "", ""]
+  },
+  "on-click": "pamixer --toggle-mute",
+  "on-click-right": "pavucontrol",
+  "tooltip": false
+},
+
+"backlight#gar": {
+  "device": "intel_backlight",
+  "format": "{icon} {percent}%",
+  "format-icons": ["", ""]
+},
+
+"battery#gar": {
+  "interval": 60,
+  "align": 0,
+  "rotate": 0,
+  //"bat": "BAT1",
+  //"adapter": "ACAD",
+  "full-at": 100,
+  "design-capacity": false,
+  "states": {
+    "good": 95,
+    "warning": 30,
+    "critical": 15
+       },
+  "format": "{icon}  {capacity}%",
+  "format-charging": " {capacity}%",
+  "format-plugged": "󱘖 {capacity}%",
+  "format-full": "{icon} Full",
+  "format-alt": "{icon} {time}",
+  "format-icons": ["", "", "", "", ""],
+  "format-time": "{H}h {M}min",
+  "tooltip": true,
+  "tooltip-format": "{timeTo} {power}w",
+  "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
+  "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
+},    
+}
\ No newline at end of file
diff --git a/config/waybar/configs/Gardenia b/config/waybar/configs/Gardenia
new file mode 100644
index 00000000..0adec1c4
--- /dev/null
+++ b/config/waybar/configs/Gardenia
@@ -0,0 +1,118 @@
+//* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+//* ............................................*/
+//* .............GARDENIA.......................*/
+//* ............................................*/
+//* --- 👍 designed by https://github.com/Krautt  👍 --- */
+
+{
+ 
+
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "bottom",
+"spacing": 5,
+"fixed-center": false,
+"ipc": true,
+//"margin-top": 5,
+"margin-bottom": 5,
+"width": 768,
+	
+"modules-left": ["clock#gar","tray"],
+	  
+"modules-center": ["hyprland/workspaces#gar"], 
+	
+"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
+
+
+// M O D U L E S //
+
+"hyprland/workspaces#gar": {
+  "disable-scroll": true,
+  "all-outputs": true,
+  "format": "{icon}",
+  "persistent_workspaces": {
+    "1": [],
+    "2": [],
+    "3": [],
+    "4": [],
+    "5": []
+    },
+  "format-icons": {
+    "1": "一",
+    "2": "二",
+    "3": "三",
+    "4": "四",
+    "5": "五"
+    }
+},
+
+"clock#gar": {
+	"format": "{:%a %d | %H:%M %p}",
+	"format-alt": "{:%A, %d %B, %Y (%R)}"
+},
+
+"hyprland/window#gar": {
+  "format": "{}",
+  "max-length": 60
+},
+
+"tray#gar": {
+  "icon-size": 15,
+  "spacing": 10
+},
+
+"pulseaudio#gar": {
+  "format": "{icon} {volume}%",
+  "format-bluetooth": "{icon} {volume}%",
+  "format-bluetooth-muted": " {icon}",
+  "format-muted": "󰸈",
+  "format-icons": {
+      "headphone": "",
+      "hands-free": "",
+      "headset": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": ["", "", ""]
+    },
+  "on-click": "pamixer --toggle-mute",
+  "on-click-right": "pavucontrol",
+  "tooltip": false
+},
+
+"backlight#gar": {
+  "device": "intel_backlight",
+  "format": "{icon} {percent}%",
+  "format-icons": ["", ""]
+},
+
+"battery#gar": {
+  "interval": 60,
+  "align": 0,
+  "rotate": 0,
+  //"bat": "BAT1",
+  //"adapter": "ACAD",
+  "full-at": 100,
+  "design-capacity": false,
+  "states": {
+    "good": 95,
+    "warning": 30,
+    "critical": 15
+       },
+  "format": "{icon}  {capacity}%",
+  "format-charging": " {capacity}%",
+  "format-plugged": "󱘖 {capacity}%",
+  "format-full": "{icon} Full",
+  "format-alt": "{icon} {time}",
+  "format-icons": ["", "", "", "", ""],
+  "format-time": "{H}h {M}min",
+  "tooltip": true,
+  "tooltip-format": "{timeTo} {power}w",
+  "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
+  "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
+},
+   
+}
\ No newline at end of file
diff --git a/config/waybar/configs/config-Left b/config/waybar/configs/Left
index 99c34051..99c34051 100644
--- a/config/waybar/configs/config-Left
+++ b/config/waybar/configs/Left
diff --git a/config/waybar/configs/Peony b/config/waybar/configs/Peony
new file mode 100644
index 00000000..0c490202
--- /dev/null
+++ b/config/waybar/configs/Peony
@@ -0,0 +1,129 @@
+//* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+//* ............................................*/
+//* ................PEONY.......................*/
+//* ............................................*/
+//* --- 👍 designed by https://github.com/Krautt  👍 --- */
+
+{
+ 
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 0,
+"fixed-center": false,
+"ipc": true,
+"margin-top": 5,
+//"margin-bottom": 5,
+"width": 1444,
+	
+"modules-left": ["hyprland/workspaces#peony", "tray#peony"],
+  
+"modules-center": ["clock#peony"], 
+	
+"modules-right": ["wireplumber#peony","custom/separator#line","backlight#peony","custom/separator#line","temperature#peony","custom/separator#line","battery#peony","network#peony"],
+
+
+//M O D U L E S //
+
+"hyprland/workspaces#peony": {
+	"active-only":false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"on-click": "activate",
+	"persistent_workspaces":{
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": []
+	},
+	"format-icons": {
+        "1": "I",
+	    "2": "II",
+	    "3": "III",
+	    "4": "IV",
+	    "5": "V"
+	  
+	}
+  },
+
+"clock#peony": {
+	"interval": 60,
+	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
+	"format": "{:%B | %a %d, %Y | %H:%M %p}",
+	"format-alt": "{:%a %b %d, %G}"
+},
+
+"wireplumber#peony": {
+	"format": "{icon} {volume}",
+	"format-muted": " Mute",
+	"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",
+	"format-icons": ["", "", "󰕾", ""], 
+},
+
+"backlight#peony": {
+	"device": "intel_backlight",
+	"format": "{percent}% {icon}",
+	"format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"],
+},
+		
+"temperature#peony": {
+	// "thermal-zone": 2,
+	// "hwmon-path": ["/sys/class/hwmon/hwmon2/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
+	// "critical-threshold": 80,
+	// "format-critical": "{temperatureC}°C ",
+	"format": "{temperatureC}°C "
+
+},
+
+"network#peony": {
+	"format": "{ifname}",
+	"format-wifi": "{icon}",
+	"format-ethernet": "󰌘",
+	"format-disconnected": "󰌙", 
+	"tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
+	"format-linked": "󰈁 {ifname} (No IP)",
+	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
+	"tooltip-format-ethernet": "{ifname} 󰌘",
+	"tooltip-format-disconnected": "󰌙 Disconnected",
+	"max-length": 50,
+	"format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
+},
+
+"battery#peony": {
+	"interval": 60,
+	"align": 0,
+	"rotate": 0,
+	//"bat": "BAT1",
+	//"adapter": "ACAD",
+	"full-at": 100,
+	"design-capacity": false,
+	"states": {
+    "good": 95,
+    "warning": 30,
+    "critical": 15
+	},
+	"format": "{icon}  {capacity}%",
+	"format-charging": " {capacity}%",
+	"format-plugged": "󱘖 {capacity}%",
+	"format-full": "{icon} Full",
+	"format-alt": "{icon} {time}",
+	"format-icons": ["", "", "", "", ""],
+	"format-time": "{H}h {M}min",
+	"tooltip": true,
+	"tooltip-format": "{timeTo} {power}w",
+	"on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
+	"on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
+},
+
+"tray#peony": {
+	"icon-size": 17,
+	"spacing": 8,
+}
+}	
\ No newline at end of file
diff --git a/config/waybar/configs/config-Right b/config/waybar/configs/Right
index 69d47950..69d47950 100644
--- a/config/waybar/configs/config-Right
+++ b/config/waybar/configs/Right
diff --git a/config/waybar/configs/config-Top-&-Bottom b/config/waybar/configs/Top-&-Bottom
index 91877931..ae9c546a 100644
--- a/config/waybar/configs/config-Top-&-Bottom
+++ b/config/waybar/configs/Top-&-Bottom
@@ -17,7 +17,6 @@
 "margin-right": 8,
 
 "modules-left": [
-	"hyprland/workspaces#2", 
 	"cpu", 
 	"temperature", 
 	"memory",
@@ -62,7 +61,7 @@
 	 ],
 
 "modules-center": [
-	"cava",
+	"hyprland/workspaces#2", 
 	],
 
 "modules-right": [
diff --git a/config/waybar/configs/config-Top-Left b/config/waybar/configs/Top-Left
index 97e356f0..97e356f0 100644
--- a/config/waybar/configs/config-Top-Left
+++ b/config/waybar/configs/Top-Left
diff --git a/config/waybar/configs/config-Top-Right b/config/waybar/configs/Top-Right
index 1be48977..1be48977 100644
--- a/config/waybar/configs/config-Top-Right
+++ b/config/waybar/configs/Top-Right
diff --git a/config/waybar/configs/config-Bottom(plasma) b/config/waybar/configs/config-Bottom(plasma)
deleted file mode 100644
index 2aa9f910..00000000
--- a/config/waybar/configs/config-Bottom(plasma)
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-
-// ### "Plasma" (bottom) ### //
-
-{
-"include": "~/.config/waybar/modules",
-"layer": "top",
-//"mode": "dock",
-"exclusive": true,
-"passthrough": false,
-"position": "bottom",
-"spacing": 3,
-"fixed-center": true,
-"ipc": true,
-"margin-left": 6,
-"margin-right": 6,
-"margin-bottom": 4,
-
-"modules-left": [
-	"custom/menu", 
-	"hyprland/workspaces#3",
-	"wlr/taskbar",
-	 ],
-  
-"modules-center": [
-	"hyprland/window",
-	"custom/light_dark",
-	], 
-
-"modules-right": [
-	"tray", 
- 	"custom/weather",
-	"clock",
-	"cpu", 
-	"temperature", 
-	"memory",  
-	"backlight",
-	"battery",
-	"pulseaudio",
-	//"wireplumber", 
-	"pulseaudio#microphone",
-	//"custom/updater",
-	"keyboard-state", 
-	"custom/cycle_wall",
-	"custom/power",
-	],
-}
diff --git a/config/waybar/configs/config-Top(gnome) b/config/waybar/configs/config-Top(gnome)
deleted file mode 100644
index 7434b90c..00000000
--- a/config/waybar/configs/config-Top(gnome)
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-
-// ### "Gnome" style (top) ### //
-{
-"include": "~/.config/waybar/modules",
-"layer": "top",
-//"mode": "dock",
-"exclusive": true,
-"passthrough": false,
-"position": "top",
-"spacing": 3,
-"fixed-center": true,
-"ipc": true,
-"margin-top": 6,
-"margin-left": 8,
-"margin-right": 8,
-
-"modules-left": [
-	"custom/menu", 
-	"hyprland/workspaces#3",
-	//"custom/updater", 
-	"hyprland/window", 
-	],
-  
-"modules-center": [
-	"clock",
-	"custom/light_dark",
-	"cava",
-	"custom/weather",
-	], 
-
-"modules-right": [
-	"tray",
-	//"network",
-	"bluetooth",
-	"cpu",
-	"temperature", 
-	"memory", 
-	"battery",  
-	"backlight",
-	"keyboard-state",
-	"pulseaudio",
-	//"wireplumber", 
-	"pulseaudio#microphone", 
-	"custom/cycle_wall",
-	"custom/power",
-	],
-}
diff --git a/config/waybar/configs/config-all-sides b/config/waybar/configs/config-all-sides
deleted file mode 100644
index fdc48f9c..00000000
--- a/config/waybar/configs/config-all-sides
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-
-// ### ALL SIDES ### //
-
-[{
-// ### TOP PANEL ##
-
-"include": "~/.config/waybar/modules",
-"layer": "top",
-//"mode": "dock",
-"exclusive": true,
-"passthrough": false,
-"position": "top",
-"spacing": 3,
-"fixed-center": true,
-"ipc": true,
-"padding": 4,
-"margin-top": 6,
-"margin-left": 8,
-"margin-right": 8,
-
-"modules-left": [
-	"cpu", 
-	"temperature", 
-	"memory",
-	"disk",
-	"custom/weather", 
-	],
-  
-"modules-center": [ 
-	"hyprland/workspaces#4",
-	], 
-
-"modules-right": [	  
-	"battery", 
-	"backlight",
-	"bluetooth",
-	"network",
-	//"custom/updater",
-	"custom/cycle_wall",
-	],
-},
-
-// ### LEFT PANEL ### //
-{
-"include": "~/.config/waybar/modules",
-"layer": "top",
-"position": "left",
-"margin-top": 8,
-"margin-bottom": 8,
-"margin-left": 8,
-//"margin-right": 3,
-"spacing": 3,
-"fixed-center": true,
-"ipc": true,
-//"gtk-layer-shell": true,
-  
-"modules-left": [
-	"custom/menu",
-	],
-
-"modules-center": [
-	"custom/light_dark",
-	],
-
-"modules-right": [
-	"idle_inhibitor",
-	],
-},
-
-// ### RIGHT PANEL ### //	
-{
-"include": "~/.config/waybar/modules",
-"layer": "top",
-"position": "right",
-"margin-top": 8,
-"margin-bottom": 8,
-//"margin-left": 1,
-"margin-right": 8,
-"spacing": 3,
-"fixed-center": true,
-"ipc": true,
-"gtk-layer-shell": true,
-  
-"modules-left": [
-	"custom/lock", 
-	],
-
-"modules-center": [
-	"clock#vertical",
-	],
-
-"modules-right": [
-	"custom/power_vertical",
-	],
-},
-
-// ### BOTTOM PANEL ### //	
-{
-"include": "~/.config/waybar/modules",
-"layer": "top",
-"mode": "dock",
-"exclusive": true,
-"passthrough": false,
-"position": "bottom",
-"spacing": 3,
-"fixed-center": true,
-"ipc": true,
-"margin-left": 6,
-"margin-right": 6,
-"margin-bottom": 4,
-
-"modules-left": [  
-	"wlr/taskbar",
-	 ],
-
-"modules-center": [
-	"hyprland/window",
-	],
-
-"modules-right": [
-	"tray",
-	"keyboard-state",
-	"pulseaudio",
-	//"wireplumber", 
-	"pulseaudio#microphone",	  
-	],
-
-}]
\ No newline at end of file
diff --git a/config/waybar/configs/config-default b/config/waybar/configs/default
index 8bdc096e..2f8678ff 100644
--- a/config/waybar/configs/config-default
+++ b/config/waybar/configs/default
@@ -26,7 +26,7 @@
 	"custom/separator#dot-line",
 	"custom/weather",
 	],
-  
+
 "modules-center": [
 	"custom/menu",
 	"custom/separator#dot-line",
@@ -49,8 +49,7 @@
 	"bluetooth",
 	"custom/separator#dot-line",
 	//"network",
-	//"custom/separator#dot-line",
-	//"cava", 
+	//"custom/separator#dot-line", 
 	"battery",
 	"custom/separator#dot-line", 
 	"backlight",
@@ -64,4 +63,4 @@
 	"custom/separator#dot-line",
 	"custom/power",
 	],
-}
+}
\ No newline at end of file
diff --git a/config/waybar/configs/config-default-Bottom b/config/waybar/configs/default-Bottom
index ebb256b5..512995df 100644
--- a/config/waybar/configs/config-default-Bottom
+++ b/config/waybar/configs/default-Bottom
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT-BOTTOM### //
+// ### DEFAULT ### //
 {
 "include": "~/.config/waybar/modules",
 "layer": "top",
@@ -11,12 +11,12 @@
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
-"margin-left": 6,
-"margin-right": 6,
-"margin-bottom": 4,
+//"margin-top": 6,
+"margin-left": 8,
+"margin-right": 8,
 
 "modules-left": [
-	"hyprland/workspaces",
+	"hyprland/workspaces#3",
 	"custom/separator#dot-line",
 	"cpu",
 	"custom/separator#dot-line", 
@@ -26,7 +26,7 @@
 	"custom/separator#dot-line",
 	"custom/weather",
 	],
-  
+
 "modules-center": [
 	"custom/menu",
 	"custom/separator#dot-line",
@@ -48,9 +48,8 @@
 	"custom/separator#dot-line",
 	"bluetooth",
 	"custom/separator#dot-line",
-	"network",
-	"custom/separator#dot-line",
-	//"cava", 
+	//"network",
+	//"custom/separator#dot-line", 
 	"battery",
 	"custom/separator#dot-line", 
 	"backlight",
diff --git a/config/waybar/configs/config-simple-long b/config/waybar/configs/simple-long
index d94ecdac..d94ecdac 100644
--- a/config/waybar/configs/config-simple-long
+++ b/config/waybar/configs/simple-long
diff --git a/config/waybar/configs/config-simple-short b/config/waybar/configs/simple-short
index ebeb9823..ebeb9823 100644
--- a/config/waybar/configs/config-simple-short
+++ b/config/waybar/configs/simple-short