diff --git a/.config/waybar/config b/.config/waybar/config index 0608078..6ec2384 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -30,7 +30,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": ["sway/window"], - "modules-right": ["tray", "pulseaudio", "idle_inhibitor", "network", "cpu", "memory", "temperature", "clock#date", "clock#time"], + "modules-right": ["tray", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock#date", "clock#time"], // Modules configuration "sway/mode": { @@ -74,18 +74,20 @@ "spacing": 10 }, "clock#time": { - "interval": 1, - "format": "{:%H:%M:%S}", - "tooltip": false + "interval": 1, + "format": "{:%H:%M:%S}", + "tooltip": false }, "clock#date": { - "interval": 10, - "format": "{:%a %b %e %Y}", - "tooltip": false + "interval": 10, + "format": "{:%a %b %e}", + "tooltip": true, + "tooltip-format": "{:%a %b %e %Y}" }, "cpu": { - "format": "{usage:3}%", - "tooltip": false + "format": " {usage}%", + "tooltip": true, + "interval": 2 }, "memory": { "format": "{:2}%", @@ -95,46 +97,60 @@ // "thermal-zone": 2, // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", "format": "{icon} {temperatureC}°C", "format-icons": ["", "", ""], - "on-click": "exec kitty watch -n 5 sensors" + "on-click": "exec kitty watch -n 5 sensors", + "tooltip": true }, "backlight": { // "device": "acpi_video1", - "format": "{icon} {percent}%", - "format-icons": ["", ""] + "format": "{icon}{percent}", + "format-icons": [""] }, "battery": { + "bat": "BAT0", "states": { - // "good": 95, + "good": 95, "warning": 30, "critical": 15 }, - "format": "{capacity}% {icon}", - "format-charging": " {capacity}%", - "format-plugged": " {capacity}%", + "format": "{icon}{capacity}%", + "format-charging": "{capacity:3}%", + "format-plugged": "{capacity:3}%", "format-alt": "{icon}{time}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", + "format-good": "", // An empty format will hide the module + "format-full": "", "format-icons": ["", "", "", "", ""] }, "battery#bat2": { - "bat": "BAT2" + "bat": "BAT1", + "states": { + "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{icon}{capacity}%", + "format-charging": "{capacity:3}%", + "format-plugged": "{capacity:3}%", + "format-alt": "{icon}{time}", + "format-good": "", // An empty format will hide the module + "format-full": "", + "format-icons": ["", "", "", "", ""] }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": " {essid} ({signalStrength}%)", - "format-ethernet": " {ifname} ▲{bandwidthUpBits:8} ▼{bandwidthDownBits:8}", + "format-ethernet": "", "format-linked": " {ifname} (No IP)", "format-disconnected": "Disconnected ⚠", - "format-alt": "{ipaddr}/{cidr}", - "on-click-right": "exec gnome-terminal nmtui", - "interval": 1 + "format-alt": "{ifname} {ipaddr}/{cidr} ▲{bandwidthUpBits}▼{bandwidthDownBits}", + "on-click-right": "exec kitty nmtui", + "interval": 1, + "tooltip-format": "{ifname} {ipaddr}/{cidr} ▲{bandwidthUpBits}▼{bandwidthDownBits}" }, "pulseaudio": { // "scroll-step": 1, // %, can be a float - "format": "{icon}{volume:3}% {format_source}", + "format": "{icon} {volume}% {format_source}", "format-bluetooth": "{volume}% {icon} {format_source}", "format-bluetooth-muted": " {icon} {format_source}", "format-muted": " {format_source}", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 4c8f543..ddf44fe 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,5 +1,4 @@ * { - border: none; border-radius: 0; /* `otf-font-awesome` is required to be installed for icons */ font-family: 'Anka/Coder';/*Roboto, Helvetica, Arial, sans-serif; */ @@ -10,9 +9,8 @@ window#waybar { background-color: transparent; - /*background-color: rgba(43, 48, 59, 0.5);*/ - /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */ - color: #ffffff; + /* background-color: #002b36; */ + color: #a6baba; transition-property: background-color; transition-duration: .5s; } @@ -22,23 +20,22 @@ window#waybar.hidden { } #workspaces button { - padding: 2px 5px 0; + padding: 1px 5px 0px; background-color: transparent; - color: #ffffff; - /* border-bottom: 3px solid transparent; */ + color: #a6baba; + border-top: 2px solid transparent; } /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ #workspaces button:hover { background: rgba(0, 0, 0, 0.2); box-shadow: inherit; - /* border-bottom: 3px solid #ffffff; */ } #workspaces button.focused { - background-color: #64727D; - /* border-bottom: 3px solid #ffffff; */ - padding: 2px 5px 0; + background-color: #073642; /*#64727D;*/ + border-top: 2px solid #839496; + padding: 1px 5px 0px; } #workspaces button.urgent { @@ -46,9 +43,8 @@ window#waybar.hidden { } #mode { - padding: 0 5px 0; - background-color: #64727D; - /* border-bottom: 3px solid #ffffff; */ + padding: 1px 5px 0px; + background-color: #073642; } #clock, @@ -59,34 +55,25 @@ window#waybar.hidden { #backlight, #network, #pulseaudio, -#custom-media, #tray, #idle_inhibitor, #mpd { - padding: 0 10px 0; + padding: 0 1px 0; margin: 0 4px 0; - color: #ffffff; + color: #a6baba; + background-color: transparent; } #clock { - padding: 0 0 0; - background-color: transparent; } #clock.time { - background-color: transparent; min-width: 60px; } -#battery { - padding: 0 1px 0; - background-color: transparent; - color: #ffffff; -} #battery.charging { color: #26A65B; - /* background-color: #26A65B; */ } @keyframes blink { @@ -106,100 +93,10 @@ window#waybar.hidden { animation-direction: alternate; } -label:focus { - background-color: #000000; -} - -#cpu { - padding: 0 1px 0; - /* background-color: #2ecc71; */ - color: #fff; -} - -#memory { - padding: 0 1px 0; - /* background-color: #9b59b6; */ -} - -#backlight { - padding: 0 1px 0; - /* background-color: #90b1b1; */ -} - -#network { - min-width: 250px; - padding: 0 1px 0; - /* background-color: #2980b9; */ -} - #network.disconnected { - /* background-color: #f53c3c; */ -} - -#pulseaudio { - padding: 0 1px 0; - /* background-color: #f1c40f; */ - /* color: #000000; */ -} - -#pulseaudio.muted { - /* background-color: #90b1b1; */ - /* color: #2a5c45; */ -} - -#custom-media { - padding: 0 1px 0; - /* background-color: #66cc99; */ - /* color: #2a5c45; */ - /* min-width: 100px; */ -} - -#custom-media.custom-spotify { - background-color: #66cc99; -} - -#custom-media.custom-vlc { - background-color: #ffa000; -} - -#temperature { - padding: 0 1px 0; - /* background-color: #f0932b; */ + color: #f53c3c; } #temperature.critical { background-color: #eb4d4b; } - -#tray { - padding: 0 1px 0; - /* background-color: #2980b9; */ -} - -#idle_inhibitor { - padding: 0 1px 0; - /* background-color: #2d3436; */ -} - -#idle_inhibitor.activated { - /* background-color: #ecf0f1; */ - /* color: #2d3436; */ -} - -#mpd { - padding: 0 1px 0; - /* background-color: #66cc99; */ - /* color: #2a5c45; */ -} - -#mpd.disconnected { - /* background-color: #f53c3c; */ -} - -#mpd.stopped { - /* background-color: #90b1b1; */ -} - -#mpd.paused { - /* background-color: #51a37a; */ -}