diff options
| -rw-r--r-- | requirements.yml | 2 | ||||
| -rw-r--r-- | roles/waybar/templates/waybar/config.jsonc.j2 | 2 | ||||
| -rw-r--r-- | roles/wlctl/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/wlctl/tasks/main.yml | 7 |
4 files changed, 8 insertions, 6 deletions
diff --git a/requirements.yml b/requirements.yml index 7164be70..cc1701b9 100644 --- a/requirements.yml +++ b/requirements.yml @@ -6,3 +6,5 @@ collections: version: "2.1.0" - name: containers.podman version: "1.18.0" + - name: kewlfft.aur + version: "0.13.0" diff --git a/roles/waybar/templates/waybar/config.jsonc.j2 b/roles/waybar/templates/waybar/config.jsonc.j2 index 0e78caef..f02e0a50 100644 --- a/roles/waybar/templates/waybar/config.jsonc.j2 +++ b/roles/waybar/templates/waybar/config.jsonc.j2 @@ -55,7 +55,7 @@ "interval": 5, "spacing": 1, "on-click": "/etc/xdg/waybar/scripts/toggle-wifi", - "on-click-right": "/etc/xdg/waybar/scripts/launch-tui ~/.cargo/bin/wlctl" + "on-click-right": "/etc/xdg/waybar/scripts/launch-tui wlctl" }, "bluetooth": { "format-on": "", diff --git a/roles/wlctl/meta/main.yml b/roles/wlctl/meta/main.yml index 814bd22e..d02a6032 100644 --- a/roles/wlctl/meta/main.yml +++ b/roles/wlctl/meta/main.yml @@ -1,7 +1,6 @@ --- dependencies: - - role: "gcc" - - role: "rust" + - role: "yay" galaxy_info: author: "a14m" description: "Install wlctl" diff --git a/roles/wlctl/tasks/main.yml b/roles/wlctl/tasks/main.yml index da22bb07..e7eff1b8 100644 --- a/roles/wlctl/tasks/main.yml +++ b/roles/wlctl/tasks/main.yml @@ -1,7 +1,8 @@ --- - name: "Ensure wlctl is installed" - community.general.cargo: + become: true + become_user: "aur_builder" + kewlfft.aur.aur: name: "wlctl" state: "present" - environment: - PATH: "{{ ansible_env.HOME }}/.cargo/bin:{{ ansible_env.PATH }}" + use: "yay" |