diff --git a/modules/home/waybar/settings.nix b/modules/home/waybar/settings.nix index 49c320c..f424649 100644 --- a/modules/home/waybar/settings.nix +++ b/modules/home/waybar/settings.nix @@ -85,17 +85,17 @@ }; memory= { format= " {}%"; - format-alt= " {used}/{total} GiB"; + format-alt= " {used} GiB"; interval= 5; }; cpu= { - format= "󰍛 {usage}%"; - format-alt= "󰍛 {avg_frequency} GHz"; + format= " {usage}%"; + format-alt= " {avg_frequency} GHz"; interval= 5; }; network = { format-wifi = " {signalStrength}%"; - format-ethernet = "󰈀 "; + format-ethernet = "󰀂 "; tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; format-linked = "{ifname} (No IP)"; format-disconnected = "󰖪 "; @@ -106,9 +106,9 @@ }; pulseaudio= { format= "{icon} {volume}%"; - format-muted= "󰝟"; + format-muted= "󰖁"; format-icons= { - default= ["󰕾"]; + default= [""]; }; scroll-step= 5; on-click= "pamixer -t"; diff --git a/modules/home/waybar/style.nix b/modules/home/waybar/style.nix index d12ce09..2ca414d 100644 --- a/modules/home/waybar/style.nix +++ b/modules/home/waybar/style.nix @@ -59,12 +59,27 @@ background-size: 200% 200%; } - #tray, #pulseaudio, #network, + #tray, #pulseaudio, #network, cpu, memory, #custom-playerctl.backward, #custom-playerctl.play, #custom-playerctl.foward{ background: #${custom.palette.tertiary_background_hex}; font-weight: bold; margin: 5px 0px; } + + #cpu { + color: #${custom.tertiary_accent}; + border-radius: 10px 0px 0px 24px; + padding-left: 15px; + padding-right: 8px; + margin-left: 7px; + } + #memory { + color: #${custom.tertiary_accent}; + border-radius: 0px 24px 10px 0px; + padding-left: 8px; + padding-right: 15px; + } + #tray { color: #${custom.tertiary_accent}; border-radius: 10px 24px 10px 24px;