Allow user to provide a different configuration per host

roles/desktop-environment/tasks/config.yml

@@ -30,6 +30,8 @@
   loop:
     - src: "{{ role_path }}/files/.config"
       dest: "{{ ansible_env.HOME }}/"
+    - src: "{{ role_path }}/files/.local"
+      dest: "{{ ansible_env.HOME }}/"
 
 - name: Ensure presence of required directories
   file:
@@ -39,6 +41,7 @@
   loop:
     - "{{ ansible_env.HOME }}/.config/hypr"
     - "{{ ansible_env.HOME }}/.config/waybar"
+    - "{{ ansible_env.HOME }}/.local/bin"
 
 - name: Render config files
   ansible.builtin.template:
@@ -50,4 +53,11 @@
     - src: ".config/hypr/hyprland.conf.j2"
       dest: "{{ ansible_env.HOME }}/.config/hypr/hyprland.conf"
     - src: ".config/waybar/config.j2"
-      dest: "{{ ansible_env.HOME }}/.config/waybar/config"
+      dest: "{{ ansible_env.HOME }}/.config/waybar/config"
+    - src: ".local/bin/hyprhelpr.j2"
+      dest: "{{ ansible_env.HOME }}/.local/bin/hyprhelpr"
+
+- name: Make "~/.local/bin/hyprhelpr" executable
+  ansible.builtin.file:
+    dest: "{{ ansible_env.HOME }}/.local/bin/hyprhelpr"
+    mode: "og+x"

roles/desktop-environment/tasks/hyprland.yml

@@ -15,6 +15,8 @@
       - build-essential
       - cmake
       - meson
+      # hyprland-scanner
+      - libpugixml-dev
       # hyprcursor
       - libzip-dev
       - librsvg2-dev
@@ -22,8 +24,10 @@
       # Hyprland
       - libpango1.0-dev
       - libtomlplusplus-dev
+      - uuid-dev
       # xdg-desktop-portal-hyprland
-      - qtbase5-dev
+      #- qtbase5-dev
+      - qt6-base-dev
       - libspa-0.2-dev
       - libpipewire-0.3-dev
 
@@ -35,16 +39,25 @@
     owner: "{{ ansible_user_id }}"
     group: "{{ ansible_user_id }}"
   loop:
+    - "hyprwayland-scanner"
     - "Hyprland"
     - "hyprlang"
     - "hyprcursor"
     - "xdg-desktop-portal-hyprland"
 
+- name: Checkout hyprwayland-scanner repo
+  ansible.builtin.git:
+    repo: 'https://github.com/hyprwm/hyprwayland-scanner.git'
+    dest: /usr/local/src/hyprwayland-scanner
+    version: v0.3.4
+    force: true
+    recursive: true
+
 - name: Checkout Hyprland repo
   ansible.builtin.git:
     repo: 'https://github.com/hyprwm/Hyprland.git'
     dest: /usr/local/src/Hyprland
-    version: v0.39.1
+    version: v0.40.0
     force: true
     recursive: true
 
@@ -68,10 +81,24 @@
   ansible.builtin.git:
     repo: 'https://github.com/hyprwm/xdg-desktop-portal-hyprland.git'
     dest: /usr/local/src/xdg-desktop-portal-hyprland
-    version: v1.3.1
+    version: master
     force: true
     recursive: true
 
+- name: Build hyprwayland-scanner
+  ansible.builtin.command:
+    cmd: "{{ item }}"
+    chdir: /usr/local/src/hyprwayland-scanner
+  loop:
+    - "cmake -DCMAKE_INSTALL_PREFIX=/usr -B build"
+    - "cmake --build build"
+
+- name: Install hyprwayland-scanner
+  become: yes
+  ansible.builtin.command:
+    cmd: "cmake --install build"
+    chdir: /usr/local/src/hyprwayland-scanner
+
 - name: Build hyprlang
   ansible.builtin.command:
     cmd: "{{ item }}"
@@ -134,4 +161,4 @@
 - name: Reload systemd
   ansible.builtin.systemd_service:
     daemon_reload: true
-    scope: user
+    scope: user

roles/desktop-environment/tasks/utils.yml

@@ -6,7 +6,9 @@
     name:
       - swaylock
       - swaybg
+      - swayidle
       - waybar
+      - wofi
       - xdg-desktop-portal-wlr
       - xdg-desktop-portal-gtk
       - xfce4-appfinder