Refactor waybar/hyprland

6 files changed, 9 insertions, 50 deletions

diff --git a/roles/waybar/files/waybar/scripts/launch-tui b/roles/waybar/files/waybar/scripts/launch-tui
deleted file mode 100755
index 16efba9b..00000000
--- a/roles/waybar/files/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/files/waybar/scripts/toggle-bt b/roles/waybar/files/waybar/scripts/toggle-bt
deleted file mode 100755
index 1b9d4374..00000000
--- a/roles/waybar/files/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/files/waybar/scripts/toggle-wifi b/roles/waybar/files/waybar/scripts/toggle-wifi
deleted file mode 100755
index 78e0699f..00000000
--- a/roles/waybar/files/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
diff --git a/roles/waybar/meta/main.yml b/roles/waybar/meta/main.yml
index 42bff5f1..2cc72e09 100644
--- a/roles/waybar/meta/main.yml
+++ b/roles/waybar/meta/main.yml
@@ -1,11 +1,6 @@
 ---
 dependencies:
   - role: "font"
-  - role: "alacritty"
-  - role: "btop"
-  - role: "bluetui"
-  - role: "wlctl"
-  - role: "wiremix"
   - role: "gnome-calendar"
 galaxy_info:
   author: "a14m"
diff --git a/roles/waybar/tasks/main.yml b/roles/waybar/tasks/main.yml
index 47f026be..40c730fb 100644
--- a/roles/waybar/tasks/main.yml
+++ b/roles/waybar/tasks/main.yml
@@ -34,17 +34,3 @@
       dest: "/etc/xdg/waybar/config.jsonc"
     - src: "waybar/style.css.j2"
       dest: "/etc/xdg/waybar/style.css"
-
-- 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"
-    - src: "waybar/scripts/toggle-wifi"
-      dest: "/etc/xdg/waybar/scripts/toggle-wifi"
-    - src: "waybar/scripts/launch-tui"
-      dest: "/etc/xdg/waybar/scripts/launch-tui"
diff --git a/roles/waybar/templates/waybar/config.jsonc.j2 b/roles/waybar/templates/waybar/config.jsonc.j2
index 953230cb..e3dc54bb 100644
--- a/roles/waybar/templates/waybar/config.jsonc.j2
+++ b/roles/waybar/templates/waybar/config.jsonc.j2
@@ -47,6 +47,7 @@
     "on-click-right": "uwsm-app -- gnome-calendar"
   },
   "network": {
+    "tooltip": true,
     "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
     "format": "{icon}",
     "format-wifi": "{icon}",
@@ -57,10 +58,11 @@
     "tooltip-format-disconnected": "Disconnected",
     "interval": 5,
     "spacing": 1,
-    "on-click": "/etc/xdg/waybar/scripts/toggle-wifi",
-    "on-click-right": "/etc/xdg/waybar/scripts/launch-tui wlctl"
+    "on-click": "/etc/hypr/scripts/wifi.sh --toggle",
+    "on-click-right": "/etc/hypr/scripts/launch-tui wlctl"
   },
   "bluetooth": {
+    "tooltip": true,
     "format-on": "󰂯",
     "format-off": "󰂲",
     "format-disabled": "󰂲",
@@ -68,10 +70,11 @@
     "format-no-controller": "",
     "tooltip-format-connected": "Devices connected: {num_connections}\n{device_enumerate}",
     "tooltip-format-enumerate-connected": "- {device_alias}\t{device_battery_percentage}% 󰂁",
-    "on-click": "/etc/xdg/waybar/scripts/toggle-bt",
-    "on-click-right": "/etc/xdg/waybar/scripts/launch-tui bluetui"
+    "on-click": "/etc/hypr/scripts/bluetooth.sh --toggle",
+    "on-click-right": "/etc/hypr/scripts/launch-tui bluetui"
   },
   "pulseaudio": {
+    "tooltip": true,
     "format": "{icon}",
     "tooltip-format": "Volume: {volume}% {icon}",
     "scroll-step": 5,
@@ -79,8 +82,8 @@
     "format-icons": {
       "default": ["", "", ""]
     },
-    "on-click": "pamixer -t",
-    "on-click-right": "/etc/xdg/waybar/scripts/launch-tui wiremix"
+    "on-click": "/etc/hypr/scripts/volume.sh --toggle-mute-vol",
+    "on-click-right": "/etc/hypr/scripts/launch-tui wiremix"
   },
   "backlight": {
     "device": "intel_backlight",