From 730539969360e4cb188123c66466d90760a8634e Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 17 Apr 2023 11:22:50 +0200 Subject: [PATCH] Install Waybar with dedicated role --- files/config/waybar/config | 99 -------------------------- files/config/waybar/style.css | 101 -------------------------- group_vars/all/waybar.yml | 129 ++++++++++++++++++++++++++++++++++ playbook.yml | 3 +- 4 files changed, 130 insertions(+), 202 deletions(-) delete mode 100644 files/config/waybar/config delete mode 100644 files/config/waybar/style.css create mode 100644 group_vars/all/waybar.yml diff --git a/files/config/waybar/config b/files/config/waybar/config deleted file mode 100644 index bfa6dfb..0000000 --- a/files/config/waybar/config +++ /dev/null @@ -1,99 +0,0 @@ -{ - "layer": "top", - "spacing":6, - "disable-toolptips": true, - "modules-left": ["sway/workspaces", "sway/mode"], - "modules-center": [], - "modules-right": [ - "network", - "custom/sep", - "temperature", "memory", "cpu", - "custom/sep", - "backlight", "battery", - "custom/sep", - "pulseaudio", - "custom/sep", - "clock", - "custom/sep", - "tray" - ], - "sway/mode": { - "format": "{}" - }, - "custom/sep": { - "format": "|", - "tooltip": false - }, - "sway/workspace": { - "disable-scroll": true - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "clock": { - "tooltip": false, - "timezone": "Europe/Paris", - "format-alt": "{:%Y-%m-%d}" - }, - "temperature": { - "thermal-zone": 0, - "critical-threshold": 80, - "format": "{temperatureC}°C  " - }, - "cpu": { - "format": "{usage}% {icon}", - "tooltip": false, - "format-icons": [""] - }, - "backlight": { - "format": "{percent}% {icon}", - "format-icons": ["󰌶", "󱩏", "󱩐", "󱩐", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󱩖", "󰛨"], - "tooltip": false - }, - "battery": { - "tooltip": false, - "states": { - "full": 100, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - "format-icons": [" ", " ", " ", " ", " "] - }, - "network": { - "tooltip": false, - "format-wifi": "{essid} ({signalStrength}%)  ", - "format-ethernet": "{ifname}: {ipaddr}/{cidr}  ", - "format-linked": "{ifname} (No IP)  ", - "format-disconnected": "Disconnected ⚠ ", - "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "pulseaudio": { - "tooltip": false, - "format": "{format_source} {volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-muted": "{format_source} 婢 ", - "format-source": "{volume}%  ", - "format-source-muted": " ", - "format-icons": { - "headphones": " ", - "handsfree": " ", - "headset": " ", - "phone": " ", - "portable": " ", - "car": " ", - "default": "墳 " - } - }, - "memory": { - "interval": 30, - "format": "{used:0.1f}G/{total:0.1f}G " - } -} diff --git a/files/config/waybar/style.css b/files/config/waybar/style.css deleted file mode 100644 index 9cd1ef8..0000000 --- a/files/config/waybar/style.css +++ /dev/null @@ -1,101 +0,0 @@ - -@define-color color-base-bg #323232; -@define-color color-base-fg #ddd; - -@define-color electric-magenta #f268b3; -@define-color electric-green #1cd180; - -* { - border: none; - border-radius: 0; - min-height:0; -} - -window#waybar { - background: @color-base-bg ; - color: @color-base-fg; - font-family: "Fira Code Nerd Font"; - font-size: 12px; -} - -button, -button:disabled,label:disabled{ - color:inherit; -} - -button:hover{ - background:none; - box-shadow:inherit; - box-shadow:inherit; - text-shadow:inherit; - text-shadow:inherit; - border-top:none; -} -#workspaces { - color:#fff; -} -#workspaces button { - margin:0 3px; - padding:4px 4px; - color:#9c9c9c; - border-bottom: 1px solid transparent; -} - -#workspaces button:hover { - box-shadow:inherit; - text-shadow:inherit; - color: @electric-magenta; - border-bottom: 1px solid @electric-magenta; -} - -#workspaces button.focused { - background:#1cd180 ; - color:#000; -} -#workspaces button.visible:not(.focused) { - color: @electric-green; - border-color: @electric-green; -} - -#clock, -#cpu, -#memory, -#backlight, -#network, -#tray, -#mode, -#battery, -#idle_inhibitor { - padding: 2px 4px; - margin: 0; - background-color: transparent; -} - -#mode{ - background:red; - font-weight:bold; -} -#pulseaudio {} -#pulseaudio.muted { - color:#f268b3; -} - -#battery.discharging { - color: @color-base-fg; - border-bottom: none; -} - -#battery.charging, #battery.plugged { - border-bottom: 1px solid @electric-green; - color: @electric-green; -} - -#battery.critical:not(.charging) { - border-color: @electric-magenta; - color: @electric-magenta; -} - -#tray { - font-family: "DejaVu Sans"; - font-size: 12px; -} diff --git a/group_vars/all/waybar.yml b/group_vars/all/waybar.yml new file mode 100644 index 0000000..f347137 --- /dev/null +++ b/group_vars/all/waybar.yml @@ -0,0 +1,129 @@ +--- +waybar_options: + layer: "top" + spacing: 6 + disable-toolptips: true + modules-left: + - sway/workspaces + - sway/mode + modules-center: [] + modules-right: + - network + - custom/sep + - temperature + - memory + - cpu + - custom/sep + - backlight + - battery + - custom/sep + - pulseaudio + - custom/sep + - clock + - custom/sep + - tray + sway/mode: + format: '{}' + custom/sep: + format: "|" + tooltip: false + sway/workspace: + disable-scroll: true + idle_inhibitor: + format: "{icon}" + format-icons: + activated:  + deactivated:  + clock: + tooltip: false + timezone: "Europe/Paris" + format-alt: "{:%Y-%m-%d}" + temperature: + thermal-zone: 6 + critical-threshold: 80 + format: "{temperatureC}°C  " + cpu: + format: "{usage}% {icon}" + tooltip: false + states: + warning: 70 + critical: 90 + format-icons: + -  + backlight: + format: "{percent}% {icon}" + format-icons: + - 󰌶 + - 󱩏 + - 󱩐 + - 󱩐 + - 󱩑 + - 󱩒 + - 󱩓 + - 󱩔 + - 󱩕 + - 󱩖 + - 󰛨 + tooltip: false + battery: + tooltip: false + states: + full: 100 + warning: 30 + critical: 15 + format: "{capacity}% {icon} " + format-charging: "{capacity}% " + format-plugged: "{capacity}% " + format-alt: "{time} {icon}" + format-icons: + -  + -  + -  + -  + -  + network: + tooltip: false + format-wifi: "{essid} ({signalStrength}%)  " + format-ethernet: "{ifname}: {ipaddr}/{cidr}  " + format-linked: "{ifname} (No IP)  " + format-disconnected: "Disconnected ⚠ " + format-alt: "{ifname}: {ipaddr}/{cidr}" + pulseaudio: + tooltip: false + format: "{format_source} {volume}% {icon} " + format-bluetooth: "{volume}% {icon}" + format-muted: "{format_source} 婢 " + format-source: "{volume}%  " + format-source-muted: " " + format-icons: + headphones:  + handsfree:  + headset:  + phone:  + portable:  + car:  + default: 墳 + memory: + interval: 30 + states: + warning: 70 + critical: 90 + format: "{used:0.1f}G/{total:0.1f}G " + + +waybar_style: + colors: + bg: '#323232' + fg: '#ddd' + hover: '#f268b3' + selected: '#1cd180' + ok: '#1cd180' + warning: '#f2b768' + critical: '#f268b3' + fonts: + bar: + family: 'Fira Code Nerd Font' + size: '12px' + tray: + family: 'DejaVu sans' + size: '12px' diff --git a/playbook.yml b/playbook.yml index f105cf7..36e73da 100644 --- a/playbook.yml +++ b/playbook.yml @@ -72,6 +72,7 @@ - ansible-mako - ansible-swaylock - ansible-swayidle + - ansible-waybar - name: Configure desktop hosts: all @@ -139,7 +140,6 @@ - pipewire-pulse - qutebrowser - rsync - - waybar - wireplumber - xdg-desktop-portal-wlr become: true @@ -163,6 +163,5 @@ state: started loop: - import-gsettings.service - - waybar.service when: service_file is changed and not ansible_check_mode