diff options
| -rw-r--r-- | dots/sway/.config/sway/config.d/bindings.j2 | 4 | ||||
| -rw-r--r-- | dots/swaylock/.config/swaylock/config.j2 (renamed from dots/sway/.config/swaylock/config.j2) | 0 | ||||
| -rw-r--r-- | dots/waybar/.config/waybar/config.j2 | 203 | ||||
| -rw-r--r-- | dots/waybar/.config/waybar/style.css.j2 | 11 |
4 files changed, 122 insertions, 96 deletions
diff --git a/dots/sway/.config/sway/config.d/bindings.j2 b/dots/sway/.config/sway/config.d/bindings.j2 index efaf572..8737fa7 100644 --- a/dots/sway/.config/sway/config.d/bindings.j2 +++ b/dots/sway/.config/sway/config.d/bindings.j2 @@ -53,8 +53,8 @@ bindsym --to-code { bindsym --to-code { {% for name, ws in window_manager.workspaces.items() %} - $mod+{{ ws.key }} workspace {{ name }} - $mod+$mov+{{ ws.key }} move container to workspace {{ name }} + $mod+{{ ws.key }} workspace {{ ws.order }} + $mod+$mov+{{ ws.key }} move container to workspace {{ ws.order }} {% endfor %} } diff --git a/dots/sway/.config/swaylock/config.j2 b/dots/swaylock/.config/swaylock/config.j2 index a43037d..a43037d 100644 --- a/dots/sway/.config/swaylock/config.j2 +++ b/dots/swaylock/.config/swaylock/config.j2 diff --git a/dots/waybar/.config/waybar/config.j2 b/dots/waybar/.config/waybar/config.j2 index e36e003..be30628 100644 --- a/dots/waybar/.config/waybar/config.j2 +++ b/dots/waybar/.config/waybar/config.j2 @@ -1,103 +1,122 @@ { - "layer": "top", - "position": "top", - "modules-left": ["clock","tray"], - "modules-center": ["sway/workspaces"], - "modules-right": ["group/expand","bluetooth","network","battery"], - "sway/workspaces": { - "format": "{icon} {name}", - "format-icons": { + "layer": "top", + "position": "top", + "modules-left": ["clock","tray"], + "modules-center": ["sway/workspaces"], + "modules-right": ["group/expand","pulseaudio","bluetooth","network","battery"], + "sway/workspaces": { + "format": "{icon}", + "format-icons": { {% for name, ws in window_manager.workspaces.items() %} - "{{ name }}": "{{ ws.icon }}", + "{{ ws.order }}": "{{ ws.icon }} {{ name }}", {% endfor %} - }, - "on-click": "activate" }, - "clock": { - "format": "{:%H:%M:%S | %a %b %e} ", - "interval": 1, - "tooltip-format": "<tt>{calendar}</tt>", - "calendar": { - "format": { - "today": "<span color='#fAfBfC'><b>{}</b></span>" - } - }, - "actions": { - "on-click-right": "shift_down", - "on-click": "shift_up" + "on-click": "activate" + }, + "clock": { + "format": "{:%H:%M:%S | %a %b %e} ", + "interval": 1, + "tooltip-format": "<tt>{calendar}</tt>", + "calendar": { + "format": { + "today": "<span color='#fAfBfC'><b>{}</b></span>" } }, - "network": { - "format-wifi": " ", - "format-ethernet":" ", - "format-disconnected": " ", - "tooltip-format-disconnected": "Error", - "tooltip-format-wifi": "{essid} ({signalStrength}%) ", - "tooltip-format-ethernet": "{ifname} 🖧 ", + "actions": { + "on-click-right": "shift_down", + "on-click": "shift_up" + } + }, + "network": { + "format-wifi": " {ipaddr}", + "format-ethernet":" {ipaddr}", + "format-disconnected": " ", + "tooltip-format-disconnected": "Error", + "tooltip-format-wifi": "{essid} ({signalStrength}%) ", + "tooltip-format-ethernet": "{ifname} 🖧 ", + }, + "bluetooth": { + "format-on": "", + "format-off": "BT-off", + "format-disabled": "", + "format-connected-battery": "{device_battery_percentage}% ", + "format-alt": "{device_alias} ", + "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}\n{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}\n{device_address}\n{device_battery_percentage}%", + "on-click-right": "blueman-manager", + }, + "pulseaudio": { + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-muted": "", + "format-icons": { + "alsa_output.pci-0000_00_1f.3.analog-stereo": "", + "alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "", + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "phone-muted": "", + "portable": "", + "car": "", + "default": ["", ""] }, - "bluetooth": { - "format-on": "", - "format-off": "BT-off", - "format-disabled": "", - "format-connected-battery": "{device_battery_percentage}% ", - "format-alt": "{device_alias} ", - "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}\n{device_address}", - "tooltip-format-enumerate-connected-battery": "{device_alias}\n{device_address}\n{device_battery_percentage}%", - "on-click-right": "blueman-manager", - }, - "battery": { - "interval":30, - "states": { - "good": 95, - "warning": 30, - "critical": 20 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - "format-icons": [ - "", - "", - "", - "", - "", - "" - ], + "scroll-step": 1, + "on-click": "pavucontrol" + }, + "battery": { + "interval":30, + "states": { + "good": 95, + "warning": 30, + "critical": 20 }, - "custom/expand": { - "format": "", - "tooltip": false - }, - "custom/endpoint":{ - "format": "|", - "tooltip": false - }, - "group/expand": { - "orientation": "horizontal", - "drawer": { - "transition-duration": 600, - "transition-to-left": true, - "click-to-reveal": true - }, - "modules": ["custom/expand","cpu","memory","temperature","custom/endpoint"], - }, - "cpu": { - "format": "", - "tooltip": true - }, - "memory": { - "format": "" - }, - "temperature": { - "critical-threshold": 80, - "format": "", - }, - "tray": { - "icon-size": 14, - "spacing": 10 + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + "format-icons": [ + "", + "", + "", + "", + "", + "" + ], + }, + "custom/expand": { + "format": "", + "tooltip": false + }, + "custom/endpoint":{ + "format": "|", + "tooltip": false + }, + "group/expand": { + "orientation": "horizontal", + "drawer": { + "transition-duration": 600, + "transition-to-left": true, + "click-to-reveal": true }, + "modules": ["custom/expand","cpu","memory","temperature","custom/endpoint"], + }, + "cpu": { + "format": "", + "tooltip": true + }, + "memory": { + "format": "" + }, + "temperature": { + "critical-threshold": 80, + "format": "", + }, + "tray": { + "icon-size": 14, + "spacing": 10 + } } diff --git a/dots/waybar/.config/waybar/style.css.j2 b/dots/waybar/.config/waybar/style.css.j2 index 1b7a649..ae041d2 100644 --- a/dots/waybar/.config/waybar/style.css.j2 +++ b/dots/waybar/.config/waybar/style.css.j2 @@ -38,6 +38,7 @@ tooltip { #battery:hover, #cpu:hover, #memory:hover, +#pulseaudio:hover, #temperature:hover { transition: all 0.3s ease; color: {{ theme.colors.foreground }}; @@ -67,10 +68,11 @@ tooltip { text-shadow: 0px 0px 1.5px rgba(0, 0, 0, 0.5); transition: all 1s ease; } -#workspaces button.active { +#workspaces button.focused { color: {{ theme.colors.foreground }}; border: none; - text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + text-shadow: 0px 0px 1.5px rgba(0, 0, 0, 0.5); + transition: all 1s ease; } #bluetooth { padding: 0px 5px; @@ -82,6 +84,11 @@ tooltip { transition: all 0.3s ease; color: {{ theme.colors.regular7 }}; } +#pulseaudio { + padding: 0px 5px; + transition: all 0.3s ease; + color: {{ theme.colors.regular7 }}; +} #battery { padding: 0px 5px; transition: all 0.3s ease; |