diff --git a/config/waybar/configs/config-left b/config/waybar/configs/config-left index bb718a0..b7bac1f 100644 --- a/config/waybar/configs/config-left +++ b/config/waybar/configs/config-left @@ -14,20 +14,21 @@ //"gtk-layer-shell": true, "modules-left": [ - "clock#vertical", - "custom/light_dark", + "clock#vertical", + "custom/light_dark", ], "modules-center": [ - "hyprland/workspaces", + "hyprland/workspaces", ], "modules-right": [ - "tray", - "backlight#vertical", - "pulseaudio#microphone_vertical", - "pulseaudio#vertical", - "custom/power_vertical", - "custom/menu", + "tray", + "network", + "backlight#vertical", + "pulseaudio#microphone_vertical", + "pulseaudio", + "custom/power_vertical", + "custom/menu", ], } diff --git a/config/waybar/configs/config-right b/config/waybar/configs/config-right index 8a23eaa..64a2c60 100644 --- a/config/waybar/configs/config-right +++ b/config/waybar/configs/config-right @@ -24,9 +24,10 @@ "modules-right": [ "tray", + "network", "backlight#vertical", "pulseaudio#microphone_vertical", - "pulseaudio#vertical", + "pulseaudio", "custom/power_vertical", "custom/menu", ], diff --git a/config/waybar/configs/config-simple2 b/config/waybar/configs/config-simple2 index 4b27272..ca62a5a 100644 --- a/config/waybar/configs/config-simple2 +++ b/config/waybar/configs/config-simple2 @@ -5,6 +5,7 @@ "width": 1050, "margin-bottom": 5, "margin-top": 5, + "modules-left": [ "clock", "custom/weather", @@ -17,8 +18,8 @@ "modules-right": [ "custom/menu", "tray", - //"network", - //"bluetooth", + "network", + "bluetooth", "backlight", "pulseaudio", "battery", diff --git a/config/waybar/modules b/config/waybar/modules index 09256cc..7ec2b2a 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -215,22 +215,22 @@ "network": { "format": "{ifname}", - "format-wifi": " {signalStrength}%", - "format-ethernet": "󰈁 Wired", - "format-disconnected": "", //An empty format will hide the module. + "format-wifi": "{icon}", + "format-ethernet": "󰌘", + "format-disconnected": "󰌙", "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", "format-linked": "󰈁 {ifname} (No IP)", - "tooltip-format-wifi": "{essid}  ({signalStrength}%)", - "tooltip-format-ethernet": "{ifname} 󰈁", - "tooltip-format-disconnected": "󰈂 Disconnected", + "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", + "tooltip-format-ethernet": "{ifname} 󰌘", + "tooltip-format-disconnected": "󰌙 Disconnected", "max-length": 50, "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] }, "pulseaudio": { - "format": "{icon} {volume} %", + "format": "{icon}", "format-bluetooth": "{icon}  {volume} %", - "format-muted": "", + "format-muted": "󰖁", "format-icons": { "headphone": "", "hands-free": "", @@ -251,7 +251,7 @@ "pulseaudio#microphone": { "format": "{format_source}", - "format-source": " {volume} %", + "format-source": " {volume}%", "format-source-muted": "", "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic", "on-click-right": "pavucontrol -t 4", @@ -400,7 +400,10 @@ "align": 0, "rotate": 0, "format": "{icon}", - "format-icons": ["󰃞", "󰃟", "󰃠"], + "format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"], + "tooltip-format": "{percent}%", + "icon-size": 10, + "on-update": "", "icon-size": 10, "on-click": "", "on-click-middle": "", @@ -412,7 +415,7 @@ }, "clock#vertical": { - "format": "{:\n%H\n%M\n\n \n%d\n%m\n%y}", + "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, @@ -441,27 +444,6 @@ "on-click-right": "foot --title btop sh -c 'btop'", }, -"pulseaudio#vertical": { - "format": "{icon}", - "format-bluetooth": "\n{icon}", - "format-bluetooth-muted": "\n󰖁", - "format-muted": "󰖁", - "format-icons": { - "headphone": "󰋋", - "hands-free": "󰋋", - "headset": "󰋋", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", "󰕾", ""], - }, - "on-click-right": "pavucontrol", - "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", - "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", - "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", - "tooltip": true, -}, - "pulseaudio#microphone_vertical": { "format": "{format_source}", "format-source": "󰍬",