Merge pull request #927 from JaKooLit/development

Merge Development to main branch for release 

5 files changed, 350 insertions, 10 deletions

diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit-glass b/config/waybar/configs/[TOP & BOT] SummitSplit-glass
new file mode 100644
index 00000000..0c36cc14
--- /dev/null
+++ b/config/waybar/configs/[TOP & BOT] SummitSplit-glass
@@ -0,0 +1,93 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DUAL TOP and BOTTOM ### //
+
+[{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/UserModules",
+  ],
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "bottom",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 1,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"cpu",
+	"power-profiles-daemon", 
+	"temperature", 
+	"memory",
+	"disk", 
+	],
+  
+"modules-center": [
+	"idle_inhibitor",
+	"clock",  
+	"custom/light_dark",
+	], 
+
+"modules-right": [
+	"custom/weather",	  
+	"battery", 
+	"backlight",
+	"bluetooth",
+	"network",
+	"custom/updater",
+	"custom/cycle_wall",
+	"custom/nightlight",
+	"custom/lock", 
+	],
+},
+
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/UserModules",
+  ],
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 5,
+"fixed-center": true,
+"ipc": true,
+"height": 0,
+"margin-left": 8,
+"margin-right": 8,
+//"gtk-layer-shell": true,
+//"margin-bottom": 0,
+
+"modules-left": [
+	"custom/menu",  
+	// "wlr/taskbar",
+	"hyprland/window",
+	"mpris",
+	 ],
+
+"modules-center": [
+	"hyprland/workspaces#rw", 
+	],
+
+"modules-right": [
+	"tray",
+	"group/notify",
+	"pulseaudio",
+	//"wireplumber", 
+	"pulseaudio#microphone",	  
+	"custom/power",
+	],  
+}],
diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop
index 0b264c6b..08a87244 100644
--- a/config/waybar/configs/[TOP] Default Laptop
+++ b/config/waybar/configs/[TOP] Default Laptop
@@ -26,20 +26,17 @@
 	"custom/cava_mviz",
 	"custom/separator#blank",
 	"custom/playerctl",
-	"custom/separator#blank_2",
+	"custom/separator#blank",
 	"hyprland/window",
 	],
 
 "modules-center": [
-	"group/app_drawer",
 	"custom/separator#blank",
+  "group/app_drawer",
 	"group/notify",
-	"custom/separator#dot-line",
 	"hyprland/workspaces#rw",
 	"clock",
-	"custom/separator#dot-line",
 	"custom/weather",
-	"custom/separator#dot-line",
 	"idle_inhibitor",	
 	"custom/hint",	
 	],
@@ -47,14 +44,10 @@
 "modules-right": [
 	"tray",
 	"network#speed",
-	"custom/separator#dot-line",
 	"group/laptop",
-	"custom/separator#dot-line",
 	"group/mobo_drawer",
-	"custom/separator#line",  
 	"group/audio",
-	"custom/separator#dot-line", 
 	"custom/nightlight",
 	"group/status",
 	],
-}
\ No newline at end of file
+}
diff --git a/config/waybar/configs/[TOP] Default Laptop (old v5) b/config/waybar/configs/[TOP] Default Laptop (old v5)
new file mode 100644
index 00000000..0b264c6b
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default Laptop (old v5)
@@ -0,0 +1,60 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Laptop  - Top ### //
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/UserModules",
+  ],
+"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/separator#blank",
+	"custom/cava_mviz",
+	"custom/separator#blank",
+	"custom/playerctl",
+	"custom/separator#blank_2",
+	"hyprland/window",
+	],
+
+"modules-center": [
+	"group/app_drawer",
+	"custom/separator#blank",
+	"group/notify",
+	"custom/separator#dot-line",
+	"hyprland/workspaces#rw",
+	"clock",
+	"custom/separator#dot-line",
+	"custom/weather",
+	"custom/separator#dot-line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	],
+
+"modules-right": [
+	"tray",
+	"network#speed",
+	"custom/separator#dot-line",
+	"group/laptop",
+	"custom/separator#dot-line",
+	"group/mobo_drawer",
+	"custom/separator#line",  
+	"group/audio",
+	"custom/separator#dot-line", 
+	"custom/nightlight",
+	"group/status",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default Laptop-glass b/config/waybar/configs/[TOP] Default Laptop-glass
new file mode 100644
index 00000000..2a6db533
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default Laptop-glass
@@ -0,0 +1,51 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Laptop  - Top ### //
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/UserModules",
+  ],
+"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/separator#blank",
+	"custom/cava_mviz",
+	"custom/separator#blank",
+	"custom/playerctl",
+	"hyprland/window",
+	],
+
+"modules-center": [
+	"group/app_drawer",
+	"custom/separator#blank",
+	"group/notify",
+	"hyprland/workspaces#rw",
+	"clock",
+	"custom/weather",
+	"idle_inhibitor",	
+	"custom/hint",	
+	],
+
+"modules-right": [
+	"tray",
+	"group/laptop",
+	"group/mobo_drawer",
+	"group/audio",
+	"custom/nightlight",
+	"group/status",
+	],
+}
diff --git a/config/waybar/configs/[TOP] Everforest-glass b/config/waybar/configs/[TOP] Everforest-glass
new file mode 100644
index 00000000..8032f216
--- /dev/null
+++ b/config/waybar/configs/[TOP] Everforest-glass
@@ -0,0 +1,143 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* -- designed by https://github.com/DevNChill */
+// ### Everforest ### //
+
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/UserModules",
+  ],
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+//"spacing": 6,
+"fixed-center": true,
+"ipc": true,
+//"margin-top": 3,
+//"margin-left": 8,
+//"margin-right": 8,
+
+"modules-left": [
+  "custom/arch",
+	"hyprland/workspaces#rw",
+//	"mpris",
+	"group/notify",
+	"tray",
+	],
+"modules-center": [
+	"clock#forest",
+	"idle_inhibitor",
+	],
+"modules-right": [
+	"cpu#forest",
+	"memory#forest",
+	"temperature#forest",
+	"disk#forest",
+	"backlight",
+  	"battery#forest",
+	"group/audio",
+	"custom/nightlight",
+	],
+
+// Additional / Edited Waybar Modules //
+"custom/arch": {
+      "format":" ",
+      "tooltip": false,
+      "on-click": "rofi -show drun"
+},
+"clock#forest": {
+      "format": "{:L%A %d.%m.%Y - %H:%M}",
+      "tooltip-format": "<span color='#D3C6AA' size='larger'>{:%Y %B}</span>\n<tt>{calendar}</tt>",
+      "calendar-weeks-pos": "right",
+      "today-format": "<span color='#E67E80' weight='ultrabold'>{}</span>",
+      "format-calendar": "<span color='#D3C6AA' weight='normal'>{}</span>",
+      "format-calendar-weeks": "<span color='#7FBBB3'><b>W{:%V}</b></span>",
+      "format-calendar-weekdays": "<span color='#A7C080'><b>{}</b></span>",
+      "on-scroll": {
+                  "calendar": 1
+                   }
+},
+"battery#forest": {
+	//"interval": 5,
+	"align": 0,
+	"rotate": 0,
+	//"bat": "BAT1",
+	//"adapter": "ACAD",
+	"full-at": 100,
+	"design-capacity": false,
+	"states": {
+		"good": 95,
+		"warning": 30,
+		"critical": 15
+	},
+	"format": "Battery {icon}  {capacity}%",
+	"format-charging": "Battery  {capacity}%",
+	"format-plugged": "Battery 󱘖 {capacity}%",
+	"format-alt-click": "click",
+	"format-full": "Battery {icon} Full",
+	"format-alt": "Battery {icon} {time}",
+	"format-icons": [
+		"󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
+	],
+	"format-time": "{H}h {M}min",
+	"tooltip": true,
+	"tooltip-format": "{timeTo} {power}w",
+	"on-click-middle": "$HOME/.config/hypr/scripts/ChangeBlur.sh",
+	"on-click-right": "$HOME/.config/hypr/scripts/Wlogout.sh",
+},
+
+"cpu#forest": {
+	"format": "Cpu  󰍛  {usage}%",
+	"interval": 1,
+	"min-length": 5,
+	"format-alt-click": "click",
+	"format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
+	"format-icons": [
+		"▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"
+	],
+	"on-click-right": "gnome-system-monitor",
+},
+
+"disk#forest": {
+	"interval": 30,
+	//"format": "Disk    󰋊",
+	"path": "/",
+	//"format-alt-click": "click",
+	"format": "Disk 󰋊  {used}",
+  "on-click-right": "baobab",
+//	"tooltip": true,
+//	"tooltip-format": "Disk    {used} used out of {total} on {path} ({percentage_used}%)",
+},
+
+"memory#forest": {
+	"interval": 10,
+	"format": "Ram  󰾆  {used:0.1f}G",
+	"format-alt": "Ram    {percentage}%    󰾆",
+	"format-alt-click": "click",
+	"tooltip": true,
+	"tooltip-format": "Ram    {used:0.1f}GB/{total:0.1f}G",
+	"on-click-right": "kitty --title btop sh -c 'btop'"
+},
+"temperature#forest": {
+	"interval": 10,
+	"tooltip": true,
+	"hwmon-path": [
+		"/sys/class/hwmon/hwmon1/temp1_input",
+		"/sys/class/thermal/thermal_zone0/temp"
+	],
+	//"thermal-zone": 0,
+	"critical-threshold": 82,
+	"format-critical": "Temp {icon}  {temperatureC}°C",
+	"format": "Temp {icon}  {temperatureC}°C",
+	"format-icons": [
+		" 󰈸"
+	],
+	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+},
+}
+