diff options
Diffstat (limited to '')
| -rw-r--r-- | dotfiles/labwc/rc.xml | 2 | ||||
| -rw-r--r-- | dotfiles/waybar/config.jsonc | 41 | ||||
| -rw-r--r-- | dotfiles/waybar/style.css | 36 |
3 files changed, 48 insertions, 31 deletions
diff --git a/dotfiles/labwc/rc.xml b/dotfiles/labwc/rc.xml index df1d58d..d6a0fd5 100644 --- a/dotfiles/labwc/rc.xml +++ b/dotfiles/labwc/rc.xml @@ -17,7 +17,7 @@ default values. <keepBorder>yes</keepBorder> <font> <name>Segoe UI</name> - <size>10</size> + <size>12</size> <slant>normal</slant> <weight>normal</weight> </font> diff --git a/dotfiles/waybar/config.jsonc b/dotfiles/waybar/config.jsonc index 00e32e4..73e1007 100644 --- a/dotfiles/waybar/config.jsonc +++ b/dotfiles/waybar/config.jsonc @@ -2,29 +2,29 @@ { "layer": "top", // Waybar at top layer "position": "left", // Waybar position (top|bottom|left|right) + "margin": 5, // "height": 30, // Waybar height (to be removed for auto height) // "width": 10, // Waybar width - "spacing": 4, // Gaps between modules (4px) + "spacing": 10, // Gaps between modules (4px) "reload_style_on_change": true, // Choose the order of the modules "modules-left": [ "wlr/taskbar", ], "modules-center": [ - "wlr/workspaces" + "clock", ], "modules-right": [ + "pulseaudio", "network", + "bluetooth", "battery", - "temperature", - "privacy", - "pulseaudio", - "clock", + "custom/languages", "tray", "custom/power" ], // Modules configuration - // "sway/workspaces": { + // "wlr/workspaces": { // "disable-scroll": true, // "all-outputs": true, // "warp-on-scroll": false, @@ -42,11 +42,11 @@ // }, "tray": { // "icon-size": 21, - "spacing": 10 + "spacing": 15 }, "clock": { "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", - "format": "{:%H:%M\n%a\n%d/%m}", + "format": "{:%H\n%M}", "justify": "center" }, "temperature": { @@ -76,10 +76,20 @@ "format-icons": ["", "", "", "", ""] }, + "bluetooth": { + "format": "", + "format-connected": "", + "format-disabled": "✘", + "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%" + }, + "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "justify": "center", - "format-wifi": " \n{signalStrength}%", + "format-wifi": " ", "format-ethernet": " \n", "tooltip-format-wifi": "{ipaddr} @ {essid}", "tooltip-format-ethernet": "{ipaddr} @ {ifname}", @@ -91,11 +101,10 @@ "pulseaudio": { // "scroll-step": 1, // %, can be a float "justify": "center", - "format": "{icon}\n{volume}%", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "", + "format": " ", + "format-bluetooth": "", + "format-muted": " ", + "format-source": " ", "format-source-muted": "", "format-icons": { "headphone": "", @@ -105,7 +114,7 @@ "portable": "", "car": "", "default": ["", "", ""], - "muted": [""] + "muted": [""] }, "on-click": "wpctl set-mute @DEFAULT_SINK@ toggle", "on-click-right": "pavucontrol" diff --git a/dotfiles/waybar/style.css b/dotfiles/waybar/style.css index 2c5d65a..9e18fbd 100644 --- a/dotfiles/waybar/style.css +++ b/dotfiles/waybar/style.css @@ -1,10 +1,10 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 9px; + font-family: Roboto, Helvetica, "Font Awesome 6 Free Solid", Arial, sans-serif; + font-size: 15px; } -@define-color bg-color #2b2b23; +@define-color background-color #1b1b1b; @define-color accent-color #4c5b3f; @define-color text-color #e4e4e4; @define-color dark-text-color #2b2b23; @@ -13,9 +13,9 @@ @define-color critical-color #c65858; window#waybar { - background-color: @bg-color; + background-color: @background-color; color: @text-color; - padding: 0 5px; + border-radius: 5px; } /* @@ -28,7 +28,7 @@ window#waybar.solo { */ button:hover { - transition: background-color 0.2s; + transition: @background-color 0.2s; } #workspaces button { @@ -50,13 +50,14 @@ button:hover { } #battery, +#bluetooth, #temperature, #network, #pulseaudio, #wireplumber, #tray { - padding: 2px 0; - border-radius: 10px 15px 10px 15px; + padding: 8px 0; + border-radius: 5px; transition: background-color 0.2s; } @@ -71,17 +72,17 @@ button:hover { #window, #workspaces { - margin: 0 4px; + /* margin: 0 4px; */ } /* If workspaces is the leftmost module, omit left margin */ .modules-left > widget:first-child > #workspaces { - margin-left: 0; + /* margin-left: 0; */ } /* If workspaces is the rightmost module, omit right margin */ .modules-right > widget:last-child > #workspaces { - margin-right: 0; + /* margin-right: 0; */ } #pulseaudio { @@ -92,8 +93,14 @@ button:hover { #pulseaudio.muted { background-color: @background-color; color: @text-color; - padding: 4px 0; - font-size: 13px; +} + +#bluetooth { + background-color: @critical-color; +} + +#bluetooth.disabled { + background-color: @background-color; } /* Using steps() instead of linear as a timing function to limit cpu usage */ #battery.critical:not(.charging) { @@ -160,10 +167,11 @@ menu { padding: 0; background-color: @bg-color; color: @text-color; + border-radius: 5px; } menuitem { padding: 5px 0; - margin: 2px 0; + /* margin: 2px 0; */ } menuitem:hover { border-radius: 4px; |