Configure waybar scripts for launch tui and power menus

6 files changed, 28 insertions, 6 deletions

diff --git a/roles/hyprland/tasks/main.yml b/roles/hyprland/tasks/main.yml
index e8523571..e9b4301f 100644
--- a/roles/hyprland/tasks/main.yml
+++ b/roles/hyprland/tasks/main.yml
@@ -101,8 +101,6 @@
     dest: "{{ item.dest }}"
     mode: "0755"
   loop:
-    - src: "scripts/launch-tui"
-      dest: "/etc/hypr/scripts/launch-tui"
     - src: "scripts/brightness.sh"
       dest: "/etc/hypr/scripts/brightness.sh"
     - src: "scripts/volume.sh"
diff --git a/roles/hyprland/files/scripts/launch-tui b/roles/waybar/files/scripts/launch-tui
index 16efba9b..16efba9b 100755
--- a/roles/hyprland/files/scripts/launch-tui
+++ b/roles/waybar/files/scripts/launch-tui
diff --git a/roles/waybar/files/scripts/power-menu b/roles/waybar/files/scripts/power-menu
new file mode 100755
index 00000000..d9be8315
--- /dev/null
+++ b/roles/waybar/files/scripts/power-menu
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec setsid uwsm-app -- /etc/hypr/scripts/power.sh
diff --git a/roles/waybar/tasks/main.yml b/roles/waybar/tasks/main.yml
index 40c730fb..718519a5 100644
--- a/roles/waybar/tasks/main.yml
+++ b/roles/waybar/tasks/main.yml
@@ -34,3 +34,15 @@
       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: "scripts/launch-tui"
+      dest: "/etc/hypr/scripts/launch-tui"
+    - src: "scripts/power-menu"
+      dest: "/etc/xdg/waybar/scripts/power-menu"
diff --git a/roles/waybar/templates/waybar/config.jsonc.j2 b/roles/waybar/templates/waybar/config.jsonc.j2
index e3dc54bb..74ba5bff 100644
--- a/roles/waybar/templates/waybar/config.jsonc.j2
+++ b/roles/waybar/templates/waybar/config.jsonc.j2
@@ -20,7 +20,8 @@
     "hyprland/language",
     "keyboard-state",
     "cpu",
-    "battery"
+    "battery",
+    "custom/power"
   ],
   "hyprland/workspaces": {
     "on-click": "activate",
@@ -59,7 +60,7 @@
     "interval": 5,
     "spacing": 1,
     "on-click": "/etc/hypr/scripts/wifi.sh --toggle",
-    "on-click-right": "/etc/hypr/scripts/launch-tui wlctl"
+    "on-click-right": "/etc/xdg/waybar/scripts/launch-tui wlctl"
   },
   "bluetooth": {
     "tooltip": true,
@@ -71,7 +72,7 @@
     "tooltip-format-connected": "Devices connected: {num_connections}\n{device_enumerate}",
     "tooltip-format-enumerate-connected": "- {device_alias}\t{device_battery_percentage}% 󰂁",
     "on-click": "/etc/hypr/scripts/bluetooth.sh --toggle",
-    "on-click-right": "/etc/hypr/scripts/launch-tui bluetui"
+    "on-click-right": "/etc/xdg/waybar/scripts/launch-tui bluetui"
   },
   "pulseaudio": {
     "tooltip": true,
@@ -83,7 +84,7 @@
       "default": ["", "", ""]
     },
     "on-click": "/etc/hypr/scripts/volume.sh --toggle-mute-vol",
-    "on-click-right": "/etc/hypr/scripts/launch-tui wiremix"
+    "on-click-right": "/etc/xdg/waybar/scripts/launch-tui wiremix"
   },
   "backlight": {
     "device": "intel_backlight",
@@ -144,5 +145,11 @@
       "warning": 20,
       "critical": 10
     }
+  },
+  "custom/power" : {
+    "interval": "once",
+    "tooltip": false,
+    "format": "",
+    "on-click": "/etc/xdg/waybar/scripts/power-menu"
   }
 }
diff --git a/roles/waybar/templates/waybar/style.css.j2 b/roles/waybar/templates/waybar/style.css.j2
index 100ab358..f9a76502 100644
--- a/roles/waybar/templates/waybar/style.css.j2
+++ b/roles/waybar/templates/waybar/style.css.j2
@@ -66,6 +66,7 @@ tooltip {
 #bluetooth,
 #language,
 #custom-sunset,
+#custom-power,
 #battery,
 #cpu,
 #memory,
@@ -84,6 +85,7 @@ tooltip {
 #bluetooth:hover,
 #language:hover,
 #custom-sunset:hover,
+#custom-power:hover,
 #battery:hover,
 #battery.charging:hover, #battery.plugged:hover, #battery.full:hover,
 #cpu:hover,