diff options
Diffstat (limited to 'waybar')
| -rw-r--r-- | waybar/config | 337 | ||||
| -rw-r--r-- | waybar/style.css | 48 |
2 files changed, 147 insertions, 238 deletions
diff --git a/waybar/config b/waybar/config index 2e6b691..0f47270 100644 --- a/waybar/config +++ b/waybar/config @@ -1,22 +1,44 @@ -[{ - "layer": "top", +// vim: set filetype=json5 : +{ + "layer": "bottom", "position": "top", "height": 36, - "output": "DP-1", + //"output": "%%DISPLAY%%", "spacing": 4, + //"margin-top": 5, + //"margin-bottom": 5, // Choose the order of the modules "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], - "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "network", "clock", "tray"], + "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 - "hyprland/workspaces": { - "format": "{icon}", - "active-only": false, + "sway/workspaces": { "all-outputs": false, + "persistent-workspaces": { + "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": { "1": "1", "2": "2", @@ -27,190 +49,38 @@ "7": "7", "8": "8", "9": "9", - "10": "1", - "11": "2", - "12": "3", - "13": "4", - "14": "5", - "15": "6", - "16": "7", - "17": "8", - "18": "9", - }, - "persistent-workspaces": { - "DP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], - //"DP-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], + "10": "0", + "11": "1", + "12": "2", + "13": "3", + "14": "4", + "15": "5", + "16": "6", + "17": "7", + "18": "8", + "19": "9", + "20": "0", + "21": "1", + "22": "2", + "23": "3", + "24": "4", + "25": "5", + "26": "6", + "27": "7", + "28": "8", + "29": "9", }, - "on-scroll-up": "hyprctl dispatch split-workspace e+1", - "on-scroll-down": "hyprctl dispatch split-workspace e-1", - "on-click": "activate" }, - "hyprland/window": { - "separate-outputs": true, - "format": "{}" - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": " {name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{artist} - {title}", - "format-stopped": "", - "format-paused": "{artist} - {title}", - "format-disconnected": "", - "artist-len": 15, - "title-len": 15, - //"album-len": 15, - //"max-length": 200, - "on-click": "mpc toggle" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - "icon-size": 20, - "spacing": 10 - }, - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "battery": { - "bat": "BAT0", - "interval": 60, - "state": { - "warning": 30, - "critical": 15 - }, - "format": "{capacity}%", - "max-length": 25 - }, - "temperature#cpu0": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "CPU TCT {temperatureC}°C {icon}", - "format": "C{temperatureC}°C", - "format-icons": ["", "", ""] - }, - "temperature#cpu1": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", - "critical-threshold": 80, - // "format-critical": "CPU TCC {temperatureC}°C {icon}", - "format": "C{temperatureC}°C", - "format-icons": ["", "", ""] - }, - "temperature#gpu0": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input", - "critical-threshold": 100, - // "format-critical": "GPU EDG {temperatureC}°C {icon}", - "format": "G{temperatureC}°C", //°C - "format-icons": ["", "", ""] - }, - "temperature#gpu1": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon1/temp2_input", - "critical-threshold": 110, - // "format-critical": "GPU JUN {temperatureC}°C {icon}", - "format": "G{temperatureC}°C", - "format-icons": ["", "", ""] - }, - "temperature#gpu2": { - // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon1/temp3_input", - "critical-threshold": 105, - // "format-critical": "GPU MEM {temperatureC}°C {icon}", - "format": "G{temperatureC}°C", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}%" - //"format-icons": ["", ""] - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "Connected ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - "max-length": 22, - "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" - }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-bluetooth-muted": "{icon} {format_source}", - "format-muted": "{format_source}", - "format-source": "", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pavucontrol" - }, - "custom/launcher":{ - "format": "", - "on-click": "exec $(tofi-drun)", - "on-click-right": "killall tofi" - }, - "custom/power":{ - "format": " ", - "on-click": "nwg-bar", - "on-click-right": "killall nwg-bar" + "niri/workspaces": { + "format": "{value}", + "all-outputs": false, + "on-click": "activate" }, - "custom/snip":{ - "format": " ", - "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" - } -}, -{ - "layer": "top", - "position": "top", - "height": 36, - "output": "HDMI-A-1", - "spacing": 4, - - // Choose the order of the modules - - "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], - "modules-center":[], - "modules-right":[ "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "network", "clock", "tray"], - - // Modules configuration - "hyprland/workspaces": { "format": "{icon}", "active-only": false, "all-outputs": false, + "persistent-only": true, "format-icons": { "1": "1", "2": "2", @@ -232,16 +102,29 @@ "18": "9", }, "persistent-workspaces": { - //"HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], - "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], + "*": 9, }, - "on-scroll-up": "hyprctl dispatch split-workspace e+1", - "on-scroll-down": "hyprctl dispatch split-workspace e-1", + "on-scroll-up": "hyprctl dispatch split:workspace r+1", + "on-scroll-down": "hyprctl dispatch split:workspace r-1", "on-click": "activate" }, + "sway/window": { + "separate-outputs": true, + "icon": true, + "format": "{title}", + "expand": true + }, + "niri/window": { + "separate-outputs": true, + "icon": true, + "format": "{title}", + "expand": true + }, "hyprland/window": { "separate-outputs": true, - "format": "{}" + "icon": true, + "format": "{title}", + "expand": true, }, "keyboard-state": { "numlock": true, @@ -284,7 +167,7 @@ "tooltip": false }, "memory": { - "format": "{}% " + "format": "{used}G " }, "battery": { "bat": "BAT0", @@ -298,42 +181,42 @@ }, "temperature#cpu0": { // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", "critical-threshold": 80, - // "format-critical": "CPU TCT {temperatureC}°C {icon}", - "format": "C{temperatureC}°C", + "format-critical": "CPU TCT {temperatureC}°C {icon}", + "format": "", "format-icons": ["", "", ""] }, "temperature#cpu1": { // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", + "hwmon-path": "/sys/class/hwmon/hwmon3/temp3_input", "critical-threshold": 80, - // "format-critical": "CPU TCC {temperatureC}°C {icon}", - "format": "C{temperatureC}°C", + "format-critical": "CPU TCC {temperatureC}°C {icon}", + "format": "", "format-icons": ["", "", ""] }, "temperature#gpu0": { // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input", + "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "critical-threshold": 100, - // "format-critical": "GPU EDG {temperatureC}°C {icon}", - "format": "G{temperatureC}°C", //°C + "format-critical": "GPU EDG {temperatureC}°C {icon}", + "format": "", //°C "format-icons": ["", "", ""] }, "temperature#gpu1": { // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon1/temp2_input", + "hwmon-path": "/sys/class/hwmon/hwmon2/temp2_input", "critical-threshold": 110, - // "format-critical": "GPU JUN {temperatureC}°C {icon}", - "format": "G{temperatureC}°C", + "format-critical": "GPU JUN {temperatureC}°C {icon}", + "format": "", "format-icons": ["", "", ""] }, "temperature#gpu2": { // "thermal-zone": 2, - "hwmon-path": "/sys/class/hwmon/hwmon1/temp3_input", + "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input", "critical-threshold": 105, - // "format-critical": "GPU MEM {temperatureC}°C {icon}", - "format": "G{temperatureC}°C", + "format-critical": "GPU MEM {temperatureC}°C {icon}", + "format": "", "format-icons": ["", "", ""] }, "backlight": { @@ -343,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) ", @@ -352,37 +235,33 @@ "max-length": 22, "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" }, - "pulseaudio": { + "wireplumber": { // "scroll-step": 1, // %, can be a float "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-bluetooth-muted": "{icon} {format_source}", - "format-muted": "{format_source}", - "format-source": "", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pavucontrol" + "format-muted": "{volume}% ", + "format-icons": ["", "", ""], + "on-click": "volsv -t", + "scroll-step": 0.1 }, "custom/launcher":{ - "format": "", - "on-click": "exec $(tofi-drun)", - "on-click-right": "killall tofi" + "format": ">_", + "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": "nwg-bar", - "on-click-right": "killall nwg-bar" + "format": "", + "on-click": "power-menu", + //"on-click-right": "killall rofi" }, "custom/snip":{ "format": " ", "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" } -}] +} diff --git a/waybar/style.css b/waybar/style.css index cf2ad88..75688fc 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: mononoki 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.4); } window#waybar.hidden { @@ -45,7 +46,7 @@ window#waybar.hidden { /* #workspaces button:hover { - background: #39c1ed; + background: #6e3c85; color: black; border-bottom: 3px solid #ffffff; @@ -56,9 +57,13 @@ window#waybar.hidden { background: #198844; } +#workspaces button.focused { + background: #198844; +} + /* #workspaces button.active:hover { - background: #39c1ed; + background: #6e3c85; color: black; border-bottom: 3px solid #ffffff; } @@ -81,10 +86,11 @@ window#waybar.hidden { #temperature, #backlight, #network, -#pulseaudio, +#wireplumber, #custom-media, #custom-launcher, #custom-power, +#custom-battery, #custom-layout, #custom-updater, #custom-snip, @@ -126,7 +132,7 @@ window#waybar.hidden { } #battery.charging, #battery.plugged { - color: #26A65B; + color: #198844; background-color: #1b1d1c; } @@ -154,11 +160,13 @@ label:focus { #cpu { background-color: #198844; color: #ffffff; + padding-right: 18px; } #memory { background-color: #1b1d1c; color: #ffffff; + padding-right: 18px; } #disk { @@ -174,6 +182,7 @@ label:focus { #network { background-color: #198844; color: #ffffff; + padding-right: 18px; } #network.disconnected { @@ -181,12 +190,13 @@ label:focus { color: #ffffff; } -#pulseaudio { +#wireplumber { background-color: #1b1d1c; color: #ffffff; + padding-right: 18px; } -#pulseaudio.muted { +#wireplumber.muted { background-color: #1b1d1c; color: #198844; } @@ -211,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{ @@ -278,7 +307,8 @@ label:focus { } #tray { - background-color: #198844; + border-radius: 20px; + background-color: black; color: #ffffff; } @@ -297,7 +327,7 @@ label:focus { #idle_inhibitor { background-color: #1b1d1c; border-radius: 20px 0px 0px 20px; - + padding-right: 18px; } #idle_inhibitor.activated { |