diff --git a/images/image.png b/images/image.png index 3b886f7..90031d3 100644 Binary files a/images/image.png and b/images/image.png differ diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 59af2d2..03b654d 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -13,6 +13,7 @@ "memory", "disk", "pulseaudio", + "pulseaudio#microphone", "backlight", "battery", "bluetooth", @@ -110,10 +111,10 @@ "pulseaudio": { "tooltip": true, - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": "󰂲 {format_source}", - "format-muted": "{volume}%  {format_source}", + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-bluetooth-muted": "{volume}% 󰂲", + "format-muted": "{volume}% ", "format-source": "{volume}% ", "format-source-muted": "{volume}% ", "format-icons": { @@ -122,16 +123,21 @@ "headset": "󰋎", "default": ["", "", ""] }, - "on-click": "pavucontrol", - "min-length": 13 + "on-click": "pavucontrol" + }, + + "pulseaudio#microphone": { + "tooltip": true, + "format": "{format_source}", + "format-source": "{volume}% ", + "format-source-muted": "{volume}% " }, "backlight": { "tooltip": true, "device": "intel_backlight", "format": "{percent}% {icon}", - "format-icons": ["󰃚", "󰃛", "󰃜", "󰃝", "󰃞", "󰃟", "󰃠"], - "min-length": 7 + "format-icons": ["󰃚", "󰃛", "󰃜", "󰃝", "󰃞", "󰃟", "󰃠"] }, "battery": { @@ -145,7 +151,7 @@ "format-charging": "{capacity}% 󰂄", "format-plugged": "{capacity}% ", "format-icons": ["󰁻", "󰁼", "󰁾", "󰂀", "󰂂", "󰁹"], - "tooltip-format": "{timeTo}\nCapacity: {capacity}\nPower: {power}w\nCycles: {cycles}\nHealth: {health}%", + "tooltip-format": "{timeTo}\nCapacity: {capacity}%\nPower: {power:0.2f}w\nCycles: {cycles}\nHealth: {health}%", "on-update": "$HOME/.config/waybar/scripts/check_battery.sh" }, diff --git a/waybar/style.css b/waybar/style.css index 22a2704..7c2858e 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -28,13 +28,11 @@ tooltip label { #mode, #clock, #battery, -#pulseaudio, #disk, #privacy, #memory, #bluetooth, -#network, -#backlight { +#network { transition: none; border-radius: 10px; background-color: #383c4a; @@ -47,6 +45,28 @@ tooltip label { margin-left: 4px; } +#backlight, +#pulseaudio { + transition: none; + background-color: #383c4a; + color: #ffffff; + margin: 0px; +} + +#pulseaudio:not(.microphone) { + margin-left: 4px; + border-radius: 10px 0 0 10px; + padding-right: 8px; + padding-left: 8px; +} + +#backlight { + border-radius: 0 10px 10px 0; + padding-left: 8px; + padding-right: 8px; + margin-right: 4px; +} + #workspaces { transition: none; border-radius: 10px; @@ -82,12 +102,6 @@ tooltip label { background-color: #26a65b; } -#pulseaudio.muted, -#pulseaudio.source-muted { - background-color: #f53c3c; - color: white; -} - #battery.charging { color: #ffffff; background-color: #26a65b;