From b597b304f5a8edce7e8d4345aabf196221a24110 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Thu, 7 Nov 2024 15:47:29 -0600 Subject: [PATCH] Adding style.css to waybar config. --- .config/hypr/hyprland.conf | 4 +- .config/waybar/config.jsonc | 281 +++++++++++++----------------------- .config/waybar/style.css | 133 +++++++++++++++++ 3 files changed, 237 insertions(+), 181 deletions(-) create mode 100644 .config/waybar/style.css diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index fcd3542..4049ec4 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -88,8 +88,8 @@ cursor { # https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 5 - gaps_out = 20 + gaps_in = 4 + gaps_out = 4 border_size = 2 diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index d61e821..aed4a59 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,220 +1,143 @@ -// -*- mode: jsonc -*- { - // "layer": "top", // Waybar at top layer - // "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 30, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - "spacing": 4, // Gaps between modules (4px) - // Choose the order of the modules + "layer": "top", + "position": "top", + "spacing": 0, + "height": 34, "modules-left": [ - "hyprland/workspaces", - "hyprland/submap", - "sway/scratchpad", - "custom/media" + "custom/logo", + "hyprland/workspaces" ], "modules-center": [ - "hyprland/window" + "clock" ], "modules-right": [ - "mpd", - "idle_inhibitor", - "pulseaudio", - "network", - "power-profiles-daemon", - "cpu", - "memory", - "temperature", - "backlight", - "keyboard-state", - "sway/language", - "battery", - "battery#bat2", - "clock", "tray", + "memory", + "network", + "wireplumber", + "battery", "custom/power" ], - // Modules configuration + "wlr/taskbar": { + "format": "{icon}", + "on-click": "activate", + "on-click-right": "fullscreen", + "icon-theme": "WhiteSur", + "icon-size": 25, + "tooltip-format": "{title}" + }, "hyprland/workspaces": { + "on-click": "activate", "disable-scroll": true, "all-outputs": true, "warp-on-scroll": false, "format": "{name}: {icon}", "format-icons": { + "default": "", "1": "", "2": "", "3": "", "4": "", "5": "", - "urgent": "", - "focused": "", - "default": "" + //"active": "󱓻", + //"urgent": "󱓻" + }, + "persistent_workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + "6": [], + "7": [], + "8": [], + "9": [] } }, - "hyprland/submap": { - "format": "✌️ {}", - "max-length": 8, - "tooltip": false - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "sway/mode": { - "format": "{}" - }, - "sway/scratchpad": { - "format": "{icon} {count}", - "show-empty": false, - "format-icons": ["", ""], - "tooltip": true, - "tooltip-format": "{app}: {title}" - }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", + "memory": { "interval": 5, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } + "format": "󰍛 {}%", + "max-length": 10 }, "tray": { - // "icon-size": 21, "spacing": 10 }, "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-full": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "power-profiles-daemon": { - "format": "{icon}", - "tooltip-format": "Power profile: {profile}\nDriver: {driver}", - "tooltip": true, - "format-icons": { - "default": "", - "performance": "", - "balanced": "", - "power-saver": "" - } + "tooltip-format": "{calendar}", + "format-alt": " {:%a, %d %b %Y}", + "format": " {:%I:%M %p}" }, "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" + "format-wifi" : "{icon}", + "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"], + "format-ethernet": "󰀂", + "format-alt" : "󱛇", + "format-disconnected" : "󰖪", + "tooltip-format-wifi": "{icon} {essid}\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}", + "tooltip-format-ethernet": "󰀂 {ifname}\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}", + "tooltip-format-disconnected": "Disconnected", + "on-click": "~/.config/rofi/wifi/wifi.sh &", + "on-click-right": "~/.config/rofi/wifi/wifinew.sh &", + "interval": 5, + "nospacing": 1, }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", + "wireplumber": { + "format": "{icon}", + "format-bluetooth": "󰂰", + "nospacing": 1, + "tooltip-format": "Volume : {volume}%", + "format-muted": "󰝟", "format-icons": { "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] + "default": ["󰖀","󰕾",""] }, - "on-click": "pavucontrol" + "on-click": "pamixer -t", + "scroll-step": 1 }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, + "custom/logo": { + "format": "  ", + "tooltip": false, + "on-click": "~/.config/rofi/launchers/misc/launcher.sh &" + }, + "battery": { + "format": "{capacity}% {icon}", "format-icons": { - "spotify": "", - "default": "🎜" + "charging": [ + "󰢜", + "󰂆", + "󰂇", + "󰂈", + "󰢝", + "󰂉", + "󰢞", + "󰂊", + "󰂋", + "󰂅" + ], + "default": [ + "󰁺", + "󰁻", + "󰁼", + "󰁽", + "󰁾", + "󰁿", + "󰂀", + "󰂁", + "󰂂", + "󰁹" + ] }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + "format-full": "Charged ", + "interval": 5, + "states": { + "warning": 20, + "critical": 10 + }, + "tooltip": false }, "custom/power": { - "format" : "⏻ ", - "tooltip": false, - "menu": "on-click", - "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder - "menu-actions": { - "shutdown": "shutdown", - "reboot": "reboot", - "suspend": "systemctl suspend", - "hibernate": "systemctl hibernate" - } + "format": "󰤆", + "tooltip": false, + "on-click": "~/.config/rofi/powermenu/type-2/powermenu.sh &" } } diff --git a/.config/waybar/style.css b/.config/waybar/style.css new file mode 100644 index 0000000..d473c0c --- /dev/null +++ b/.config/waybar/style.css @@ -0,0 +1,133 @@ +* { + border: none; + border-radius: 0; + min-height: 0; + font-family: JetBrainsMono Nerd Font; + font-size: 13px; +} + +window#waybar { + background-color: #181825; + transition-property: background-color; + transition-duration: 0.5s; +} + +window#waybar.hidden { + opacity: 0.5; +} + +#workspaces { + background-color: transparent; +} + +#workspaces button { + all: initial; + /* Remove GTK theme values (waybar #1351) */ + min-width: 0; + /* Fix weird spacing in materia (waybar #450) */ + box-shadow: inset 0 -3px transparent; + /* Use box-shadow instead of border so the text isn't offset */ + padding: 6px 18px; + margin: 6px 3px; + border-radius: 4px; + background-color: #1e1e2e; + color: #cdd6f4; +} + +#workspaces button.active { + color: #1e1e2e; + background-color: #cdd6f4; +} + +#workspaces button:hover { + box-shadow: inherit; + text-shadow: inherit; + color: #1e1e2e; + background-color: #cdd6f4; +} + +#workspaces button.urgent { + background-color: #f38ba8; +} + +#memory, +#custom-power, +#battery, +#backlight, +#wireplumber, +#network, +#clock, +#tray { + border-radius: 4px; + margin: 6px 3px; + padding: 6px 12px; + background-color: #1e1e2e; + color: #181825; +} + +#custom-power { + margin-right: 6px; +} + +#custom-logo { + padding-right: 7px; + padding-left: 7px; + margin-left: 5px; + font-size: 15px; + border-radius: 8px 0px 0px 8px; + color: #1793d1; +} + +#memory { + background-color: #fab387; +} + +#battery { + background-color: #f38ba8; +} + +#battery.warning, +#battery.critical, +#battery.urgent { + background-color: #ff0000; + color: #FFFF00; +} + +#battery.charging { + background-color: #a6e3a1; + color: #181825; +} + +#backlight { + background-color: #fab387; +} + +#wireplumber { + background-color: #f9e2af; +} + +#network { + background-color: #94e2d5; + padding-right: 17px; +} + +#clock { + font-family: JetBrainsMono Nerd Font; + background-color: #cba6f7; +} + +#custom-power { + background-color: #f2cdcd; +} + + +tooltip { + border-radius: 8px; + padding: 15px; + background-color: #131822; +} + +tooltip label { + padding: 5px; + background-color: #131822; +}