From c6d550560eabce057affdb91d9d1d8fe16bcc1cb Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhalim Date: Sun, 8 Feb 2026 19:17:09 +0100 Subject: Refactor waybar scripts to use copy instead of template --- roles/waybar/files/waybar/scripts/launch-tui | 3 +++ roles/waybar/files/waybar/scripts/toggle-bt | 11 +++++++++++ roles/waybar/files/waybar/scripts/toggle-wifi | 11 +++++++++++ roles/waybar/tasks/main.yml | 15 +++++++++------ roles/waybar/templates/waybar/scripts/launch-tui | 3 --- roles/waybar/templates/waybar/scripts/toggle-bt | 11 ----------- roles/waybar/templates/waybar/scripts/toggle-wifi | 11 ----------- 7 files changed, 34 insertions(+), 31 deletions(-) create mode 100644 roles/waybar/files/waybar/scripts/launch-tui create mode 100644 roles/waybar/files/waybar/scripts/toggle-bt create mode 100644 roles/waybar/files/waybar/scripts/toggle-wifi delete mode 100644 roles/waybar/templates/waybar/scripts/launch-tui delete mode 100644 roles/waybar/templates/waybar/scripts/toggle-bt delete mode 100644 roles/waybar/templates/waybar/scripts/toggle-wifi diff --git a/roles/waybar/files/waybar/scripts/launch-tui b/roles/waybar/files/waybar/scripts/launch-tui new file mode 100644 index 00000000..16efba9b --- /dev/null +++ b/roles/waybar/files/waybar/scripts/launch-tui @@ -0,0 +1,3 @@ +#!/bin/bash + +exec setsid uwsm-app -- alacritty --class="work.kartoffln.$(basename "$1")" -e "$@" diff --git a/roles/waybar/files/waybar/scripts/toggle-bt b/roles/waybar/files/waybar/scripts/toggle-bt new file mode 100644 index 00000000..1b9d4374 --- /dev/null +++ b/roles/waybar/files/waybar/scripts/toggle-bt @@ -0,0 +1,11 @@ +#!/bin/bash + +# Ensure bluetooth is unblocked +rfkill unblock bluetooth + +# Better UI than rfkill toggle bluetooth +if bluetoothctl show | grep -q "Powered: yes"; then + bluetoothctl power off +else + bluetoothctl power on +fi diff --git a/roles/waybar/files/waybar/scripts/toggle-wifi b/roles/waybar/files/waybar/scripts/toggle-wifi new file mode 100644 index 00000000..78e0699f --- /dev/null +++ b/roles/waybar/files/waybar/scripts/toggle-wifi @@ -0,0 +1,11 @@ +#!/bin/bash + +# Ensure wifi is unblocked +rfkill unblock wifi + +# Better UI than rfkill toggle wif +if nmcli radio wifi | grep -q "enabled"; then + nmcli radio wifi off +else + nmcli radio wifi on +fi diff --git a/roles/waybar/tasks/main.yml b/roles/waybar/tasks/main.yml index 2cf3e7b3..7b233ac5 100644 --- a/roles/waybar/tasks/main.yml +++ b/roles/waybar/tasks/main.yml @@ -23,20 +23,23 @@ ansible.builtin.template: src: "{{ item.src }}" dest: "{{ item.dest }}" - mode: "{{ item.mode }}" + mode: "0644" loop: - src: "waybar/config.jsonc.j2" dest: "/etc/xdg/waybar/config.jsonc" - mode: "0644" - src: "waybar/style.css.j2" dest: "/etc/xdg/waybar/style.css" - mode: "0644" + +- name: "Copy waybar scripts" + become: true + ansible.builtin.copy: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + mode: "0755" + loop: - src: "waybar/scripts/toggle-bt" dest: "/etc/xdg/waybar/scripts/toggle-bt" - mode: "0755" - src: "waybar/scripts/toggle-wifi" dest: "/etc/xdg/waybar/scripts/toggle-wifi" - mode: "0755" - src: "waybar/scripts/launch-tui" dest: "/etc/xdg/waybar/scripts/launch-tui" - mode: "0755" diff --git a/roles/waybar/templates/waybar/scripts/launch-tui b/roles/waybar/templates/waybar/scripts/launch-tui deleted file mode 100644 index 16efba9b..00000000 --- a/roles/waybar/templates/waybar/scripts/launch-tui +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec setsid uwsm-app -- alacritty --class="work.kartoffln.$(basename "$1")" -e "$@" diff --git a/roles/waybar/templates/waybar/scripts/toggle-bt b/roles/waybar/templates/waybar/scripts/toggle-bt deleted file mode 100644 index 1b9d4374..00000000 --- a/roles/waybar/templates/waybar/scripts/toggle-bt +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Ensure bluetooth is unblocked -rfkill unblock bluetooth - -# Better UI than rfkill toggle bluetooth -if bluetoothctl show | grep -q "Powered: yes"; then - bluetoothctl power off -else - bluetoothctl power on -fi diff --git a/roles/waybar/templates/waybar/scripts/toggle-wifi b/roles/waybar/templates/waybar/scripts/toggle-wifi deleted file mode 100644 index 78e0699f..00000000 --- a/roles/waybar/templates/waybar/scripts/toggle-wifi +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Ensure wifi is unblocked -rfkill unblock wifi - -# Better UI than rfkill toggle wif -if nmcli radio wifi | grep -q "enabled"; then - nmcli radio wifi off -else - nmcli radio wifi on -fi -- cgit v1.2.3