diff options
Diffstat (limited to 'waybar')
| -rw-r--r-- | waybar/config | 88 | ||||
| -rw-r--r-- | waybar/style.css | 35 |
2 files changed, 95 insertions, 28 deletions
diff --git a/waybar/config b/waybar/config index 25fb4dc..7faffd9 100644 --- a/waybar/config +++ b/waybar/config @@ -1,3 +1,4 @@ +// vim: set filetype=json5 : { "layer": "bottom", "position": "top", @@ -11,22 +12,31 @@ "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], - "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"], + "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"], // Modules configuration "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "11": ["eDP-1"], - "12": ["eDP-1"], - "13": ["eDP-1"], - "14": ["eDP-1"], - "15": ["eDP-1"], - "16": ["eDP-1"], - "17": ["eDP-1"], - "18": ["eDP-1"], - "19": ["eDP-1"], + "11": ["DP-2"], + "12": ["DP-2"], + "13": ["DP-2"], + "14": ["DP-2"], + "15": ["DP-2"], + "16": ["DP-2"], + "17": ["DP-2"], + "18": ["DP-2"], + "19": ["DP-2"], + "21": ["HDMI-A-1"], + "22": ["HDMI-A-1"], + "23": ["HDMI-A-1"], + "24": ["HDMI-A-1"], + "25": ["HDMI-A-1"], + "26": ["HDMI-A-1"], + "27": ["HDMI-A-1"], + "28": ["HDMI-A-1"], + "29": ["HDMI-A-1"], }, "format": "{icon}", "format-icons": { @@ -91,7 +101,8 @@ "18": "9", }, "persistent-workspaces": { - "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "DP-2": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], }, "on-scroll-up": "hyprctl dispatch split:workspace r+1", "on-scroll-down": "hyprctl dispatch split:workspace r-1", @@ -156,7 +167,7 @@ "tooltip": false }, "memory": { - "format": "{}% " + "format": "{used}G " }, "battery": { "bat": "BAT0", @@ -168,19 +179,43 @@ "format": "{capacity}%", "max-length": 25 }, - "temperature#cpu": { - "thermal-zone": 0, - // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input", + "temperature#cpu0": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", + "critical-threshold": 80, + "format-critical": "CPU TCT {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#cpu1": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon3/temp3_input", + "critical-threshold": 80, + "format-critical": "CPU TCC {temperatureC}°C {icon}", + "format": "", + "format-icons": ["", "", ""] + }, + "temperature#gpu0": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 100, + "format-critical": "GPU EDG {temperatureC}°C {icon}", + "format": "", //°C + "format-icons": ["", "", ""] + }, + "temperature#gpu1": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp2_input", "critical-threshold": 110, - "format-critical": "{temperatureC}°C", + "format-critical": "GPU JUN {temperatureC}°C {icon}", "format": "", "format-icons": ["", "", ""] }, - "temperature#gpu": { - "thermal-zone": 1, - // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input", - "critical-threshold": 126, - "format-critical": "{temperatureC}°C", + "temperature#gpu2": { + // "thermal-zone": 2, + "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", + "critical-threshold": 105, + "format-critical": "GPU MEM {temperatureC}°C {icon}", "format": "", "format-icons": ["", "", ""] }, @@ -191,7 +226,7 @@ }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", + "format-wifi": "{essid} ", "format-ethernet": "Connected ", "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", @@ -213,9 +248,16 @@ "on-click": "rofi -show drun", //"on-click-right": "killall rofi" }, + "custom/battery":{ + "interval": 15, + "format": "{percentage}%", + "return-type": "json", + "exec": "custom-battery", + "tooltip": true, + }, "custom/power":{ "format": "", - "on-click": "rofi -show p -modi p:rofi-power-menu", + "on-click": "power-menu", //"on-click-right": "killall rofi" }, "custom/snip":{ diff --git a/waybar/style.css b/waybar/style.css index 9398381..7e6e851 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -3,7 +3,7 @@ margin: 0px; border-radius: 0px; /* `otf-font-awesome` is required to be installed for icons */ - font-family: FiraCode Nerd Font Mono; + font-family: JetBrainsMono Nerd Font; font-size: 18px; min-height: 0px; min-width: 0px; @@ -14,6 +14,7 @@ window#waybar { color: #ffffff; transition-property: background-color; transition-duration: .5s; + background: rgba(0, 0, 0, 0.2); } window#waybar.hidden { @@ -89,6 +90,7 @@ window#waybar.hidden { #custom-media, #custom-launcher, #custom-power, +#custom-battery, #custom-layout, #custom-updater, #custom-snip, @@ -156,13 +158,15 @@ label:focus { } #cpu { - background-color: #1b1d1c; + background-color: #198844; color: #ffffff; + padding-right: 18px; } #memory { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; + padding-right: 18px; } #disk { @@ -178,6 +182,7 @@ label:focus { #network { background-color: #198844; color: #ffffff; + padding-right: 18px; } #network.disconnected { @@ -186,8 +191,9 @@ label:focus { } #wireplumber { - background-color: #198844; + background-color: #1b1d1c; color: #ffffff; + padding-right: 18px; } #wireplumber.muted { @@ -215,7 +221,26 @@ label:focus { background-color: #1b1d1c; font-size: 18px; margin-right: 5px; +} + +#custom-battery{ + background-color: #1b1d1c; + font-size: 18px; +} + +#custom-battery.battery_low{ + background-color: yellow; + color: #1b1d1c; +} +#custom-battery.battery_crit{ + background-color: red; + color: #1b1d1c; +} + +#custom-battery.battery_charging{ + background-color: #1d1b1c; + color: #198844; } #custom-launcher{ @@ -302,7 +327,7 @@ label:focus { #idle_inhibitor { background-color: #1b1d1c; border-radius: 20px 0px 0px 20px; - + padding-right: 18px; } #idle_inhibitor.activated { |