Merge pull request #534 from JaKooLit/main

main to development synchronize

1 files changed, 30 insertions, 114 deletions

diff --git a/config/waybar/Modules b/config/waybar/Modules
index 4984e5ee..af527737 100644
--- a/config/waybar/Modules
+++ b/config/waybar/Modules
@@ -1,9 +1,10 @@
 //* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
 /* Waybar Modules */
 
-/* NOTE: hyprland-workspaces, Custom Modules & Groups on a separate files */
+/* NOTE: hyprland-workspaces, Custom Modules, Custom Vertical & Groups on a separate files */
 
 {
+
 "temperature": {
 	"interval": 10,
 	"tooltip": true,
@@ -21,23 +22,6 @@
 	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
 
-"temperature#vertical": {
-	"interval": 10,
-	"tooltip": true,
-	"hwmon-path": [
-		"/sys/class/hwmon/hwmon1/temp1_input",
-		"/sys/class/thermal/thermal_zone0/temp"
-	],
-	//"thermal-zone": 0,
-	"critical-threshold": 80,
-	"format-critical": "{icon}\n{temperatureC}°C",
-	"format": " {icon}",
-	"format-icons": [
-		"󰈸"
-	],
-	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
-},
-
 "backlight": {
 	"interval": 2,
 	"align": 0,
@@ -64,11 +48,13 @@
 	"on-scroll-down": "$HOME/.config/hypr/scripts/Brightness.sh --dec",
 	"smooth-scrolling-threshold": 1,
 },
+
 "backlight#2": {
   "device": "intel_backlight",
   "format": "{icon} {percent}%",
   "format-icons": ["", ""]
 },
+
 "battery": {
 	//"interval": 5,
 	"align": 0,
@@ -97,6 +83,7 @@
 	"on-click-middle": "$HOME/.config/hypr/scripts/ChangeBlur.sh",
 	"on-click-right": "$HOME/.config/hypr/scripts/Wlogout.sh",
 },
+
 "bluetooth": {
 	"format": " ",
 	"format-disabled": "󰂳",
@@ -107,6 +94,7 @@
 	"tooltip": true,
 	"on-click": "blueman-manager",
 },
+
 "clock": {
 	"interval": 1,
     //"format": " {:%I:%M %p}", // AM PM format
@@ -127,6 +115,7 @@
 		}
 	}
 },
+
 "actions": {
 	"on-click-right": "mode",
 	"on-click-forward": "tz_up",
@@ -134,17 +123,20 @@
 	"on-scroll-up": "shift_up",
 	"on-scroll-down": "shift_down"
 },
+
 "clock#2": {
     //"format": " {:%I:%M %p}", // AM PM format
     "format": "  {:%H:%M}", // 24H
     "format-alt": "{:%A  |  %H:%M  |  %e %B}",
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
 },
+
 "clock#3": {
     //"format": "{:%I:%M %p - %d/%b}", //for AM/PM
     "format": "{:%H:%M - %d/%b}", // 24H
 	"tooltip": false
 },
+
 "clock#4": {
 	"interval": 60,
     //"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format
@@ -152,12 +144,14 @@
 	"format-alt": "{:%a %b %d, %G}",
 	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
 },
+
 "clock#5": {
     //"format": "{:%A, %I:%M %P}", // AM PM format
     "format": "{:%a %d | %H:%M}", // 24H
 	"format-alt": "{:%A, %d %B, %Y (%R)}",
 	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
 },
+
 "cpu": {
 	"format": "{usage}% 󰍛",
 	"interval": 1,
@@ -169,6 +163,7 @@
 	],
 	"on-click-right": "gnome-system-monitor",
 },
+
 "disk": {
 	"interval": 30,
 	//"format": "󰋊",
@@ -178,6 +173,7 @@
 	//"tooltip": true,
 	"tooltip-format": "{used} used out of {total} on {path} ({percentage_used}%)",
 },
+
 "hyprland/language": {
 	"format": "Lang: {}",
 	"format-en": "US",
@@ -185,10 +181,12 @@
 	"keyboard-name": "at-translated-set-2-keyboard",
 	"on-click": "hyprctl switchxkblayout $SET_KB next"
 },
+
 "hyprland/submap": {
 	"format": "<span style=\"italic\">  {}</span>", // Icon: expand-arrows-alt
 	"tooltip": false,
 },
+
 "hyprland/window": {
 	"format": "{}",
 	"max-length": 20,
@@ -202,6 +200,7 @@
 		"(.*) - $term": "> [$1]",
 	},
 },
+
 "idle_inhibitor": {
 	"tooltip": true,
 	"tooltip-format-activated": "Idle_inhibitor active",
@@ -212,6 +211,7 @@
 		"deactivated": " ",
 	}
 },
+
 "keyboard-state": {
 	//"numlock": true,
 	"capslock": true,
@@ -224,6 +224,7 @@
 		"unlocked": ""
 	},
 },
+
 "memory": {
 	"interval": 10,
 	"format": "{used:0.1f}G 󰾆",
@@ -233,6 +234,7 @@
 	"tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
 	"on-click-right": "kitty --title btop sh -c 'btop'"
 },
+
 "mpris": {
 	"interval": 10,
 	"format": "{player_icon} ",
@@ -262,6 +264,7 @@
 	// "ignored-players": ["firefox"]
 	"max-length": 30,
 },
+
 "network": {
 	"format": "{ifname}",
 	"format-wifi": "{icon}",
@@ -278,6 +281,7 @@
 	],
 	"on-click-right": "kitty nmtui"
 },
+
 "network#speed": {
 	"interval": 1,
 	"format": "{ifname}",
@@ -295,6 +299,7 @@
 		"󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
 	]
 },
+
 "power-profiles-daemon": {
   "format": "{icon} ",
   "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
@@ -306,6 +311,7 @@
     "power-saver": ""
   }
 },
+
 "pulseaudio": {
 	"format": "{icon} {volume}%",
 	"format-bluetooth": "{icon} 󰂰 {volume}%",
@@ -332,6 +338,7 @@
 	"tooltip-format": "{icon} {desc} | {volume}%",
 	"smooth-scrolling-threshold": 1,
 },
+
 "pulseaudio#1": {
   "format": "{icon} {volume}%",
   "format-bluetooth": "{icon} {volume}%",
@@ -351,6 +358,7 @@
   "tooltip": true,
   "tooltip-format": "{icon} {desc} | {volume}%",
 },
+
 "pulseaudio#microphone": {
 	"format": "{format_source}",
 	"format-source": " {volume}%",
@@ -362,10 +370,12 @@
 	"tooltip-format": "{source_desc} | {source_volume}%",
 	"scroll-step": 5,
 },
+
 "tray": {
 	"icon-size": 20,
 	"spacing": 4,
 },
+
 "wireplumber": {
 	"format": "{icon} {volume} %",
 	"format-muted": " Mute",
@@ -377,6 +387,7 @@
 		"", "", "󰕾", ""
 	],
 },
+
 "wlr/taskbar": {
 	"format": "{icon} {name}",
 	"icon-size": 16,
@@ -391,99 +402,4 @@
     "kitty-dropterm"
 		],
 },
-
-// Modules below are for vertical layout
-"backlight#vertical": {
-	"interval": 2,
-	"align": 0.35,
-	"rotate": 1,
-	"format": "{icon}",
-	//"format-icons": ["󰃞", "󰃟", "󰃠"],
-	"format-icons": [
-		"", "", "", "", "", "", "", "", "", "", "", "", "", "", ""
-	],
-	"on-click": "",
-	"on-click-middle": "",
-	"on-click-right": "",
-	"on-update": "",
-	"on-scroll-up": "$HOME/.config/hypr/scripts/Brightness.sh --inc",
-	"on-scroll-down": "$HOME/.config/hypr/scripts/Brightness.sh --dec",
-	"smooth-scrolling-threshold": 1,
-	"tooltip-format": "{percent}%",
-},
-"clock#vertical": {
-	"format": "\n{:%H\n%M\n%S\n\n \n%d\n%m\n%y}",
-	"interval": 1,
-	//"format": "\n{:%I\n%M\n%p\n\n \n%d\n%m\n%y}",
-	"tooltip": true,
-	"tooltip-format": "{calendar}",
-	"calendar": {
-		"mode": "year",
-		"mode-mon-col": 3,
-		"format": {
-			"today": "<span color='#0dbc79'>{}</span>",
-		}
-	}
-},
-"cpu#vertical": {
-	"format": "󰍛\n{usage}%",
-	"interval": 1,
-	"on-click-right": "gnome-system-monitor",
-},
-"memory#vertical": {
-	"interval": 10,
-	"format": "󰾆\n{percentage}%",
-	"format-alt": "󰾆\n{used:0.1f}G",
-	"format-alt-click": "click",
-	"tooltip": true,
-	"tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
-	"on-click-right": "kitty --title btop sh -c 'btop'",
-},
-"pulseaudio#vertical": {
-	"format": "{icon}",
-	"format-bluetooth": "󰂰",
-	"format-muted": "󰖁",
-	"format-icons": {
-		"headphone": "",
-		"hands-free": "",
-		"headset": "",
-		"phone": "",
-		"portable": "",
-		"car": "",
-		"default": [
-			"", "", "󰕾", ""
-		],
-		"tooltip-format": "{icon} {desc} | {volume}%",
-		"ignored-sinks": [
-			"Easy Effects Sink"
-		],
-	},
-	"scroll-step": 5.0,
-	"on-click": "$HOME/.config/hypr/scripts/Volume.sh --toggle",
-	"on-click-right": "pavucontrol -t 3",
-	"on-scroll-up": "$HOME/.config/hypr/scripts/Volume.sh --inc",
-	"on-scroll-down": "$HOME/.config/hypr/scripts/Volume.sh --dec",
-	"tooltip-format": "{icon} {desc} | {volume}%",
-	"smooth-scrolling-threshold": 1,
-},
-"pulseaudio#microphone_vertical": {
-	"format": "{format_source}",
-	"format-source": "󰍬",
-	"format-source-muted": "󰍭",
-	"on-click-right": "pavucontrol",
-	"on-click": "$HOME/.config/hypr/scripts/Volume.sh --toggle-mic",
-	"on-scroll-up": "$HOME/.config/hypr/scripts/Volume.sh --mic-inc",
-	"on-scroll-down": "$HOME/.config/hypr/scripts/Volume.sh --mic-dec",
-	"max-volume": 100,
-	"tooltip": true,
-	"tooltip-format": "{source_desc} | {source_volume}%",
-},
-"custom/power_vertical": {
-	"format": "⏻",
-	"exec": "echo ; echo 󰟡 power // blur",
-	"on-click": "$HOME/.config/hypr/scripts/Wlogout.sh",
-	"on-click-right": "$HOME/.config/hypr/scripts/ChangeBlur.sh",
-	"interval": 86400, // once every day
-	"tooltip": true,
-},
-}
+}
\ No newline at end of file