From 2949073473783071aa3172f579980d457b0047a6 Mon Sep 17 00:00:00 2001
From: BluemediaGER <oliver@traber-info.de>
Date: Wed, 19 Jun 2024 23:05:24 +0200
Subject: [PATCH] Update Hyprland to 0.41.1

---
 host_vars/kronos                             |  2 +
 roles/desktop-environment/files/20-tum.conf  |  1 +
 roles/desktop-environment/tasks/hyprland.yml | 46 +++++++++++++++++---
 roles/desktop-environment/tasks/main.yml     |  2 +-
 4 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 roles/desktop-environment/files/20-tum.conf

diff --git a/host_vars/kronos b/host_vars/kronos
index 6b6f080..a09bb13 100644
--- a/host_vars/kronos
+++ b/host_vars/kronos
@@ -1,3 +1,5 @@
+mobile_platform: false
+
 monitors:
   - desc: "LG Electronics LG ULTRAGEAR 311NTZN8J917"
     output: "DP-1"
diff --git a/roles/desktop-environment/files/20-tum.conf b/roles/desktop-environment/files/20-tum.conf
new file mode 100644
index 0000000..5ab627d
--- /dev/null
+++ b/roles/desktop-environment/files/20-tum.conf
@@ -0,0 +1 @@
+APT::Default-Release "/^testing(|-security|-updates)$/";
diff --git a/roles/desktop-environment/tasks/hyprland.yml b/roles/desktop-environment/tasks/hyprland.yml
index dc093d6..d608b3d 100644
--- a/roles/desktop-environment/tasks/hyprland.yml
+++ b/roles/desktop-environment/tasks/hyprland.yml
@@ -1,3 +1,16 @@
+- name: Set apt default-release to "testing"
+  become: yes
+  copy:
+    src: "{{ role_path }}/files/20-tum.conf"
+    dest: "/etc/apt/apt.conf.d/20-tum.conf"
+
+- name: Add unstable repository
+  become: yes
+  ansible.builtin.apt_repository:
+    repo: deb http://deb.debian.org/debian unstable main contrib non-free-firmware
+    state: present
+    update_cache: true
+
 - name: Install build dependencies (1/2)
   become: yes
   apt:
@@ -25,8 +38,8 @@
       - libpango1.0-dev
       - libtomlplusplus-dev
       - uuid-dev
+      - libxcb-errors-dev
       # xdg-desktop-portal-hyprland
-      #- qtbase5-dev
       - qt6-base-dev
       - libspa-0.2-dev
       - libpipewire-0.3-dev
@@ -39,17 +52,26 @@
     owner: "{{ ansible_user_id }}"
     group: "{{ ansible_user_id }}"
   loop:
+    - "hyprutils"
     - "hyprwayland-scanner"
     - "Hyprland"
     - "hyprlang"
     - "hyprcursor"
     - "xdg-desktop-portal-hyprland"
 
+- name: Checkout hyprutils repo
+  ansible.builtin.git:
+    repo: 'https://github.com/hyprwm/hyprutils.git'
+    dest: /usr/local/src/hyprutils
+    version: v0.1.4
+    force: true
+    recursive: true
+
 - 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
+    version: v0.3.10
     force: true
     recursive: true
 
@@ -57,7 +79,7 @@
   ansible.builtin.git:
     repo: 'https://github.com/hyprwm/Hyprland.git'
     dest: /usr/local/src/Hyprland
-    version: v0.40.0
+    version: v0.41.1
     force: true
     recursive: true
 
@@ -65,7 +87,7 @@
   ansible.builtin.git:
     repo: 'https://github.com/hyprwm/hyprlang.git'
     dest: /usr/local/src/hyprlang
-    version: v0.5.1
+    version: v0.5.2
     force: true
     recursive: true
 
@@ -73,7 +95,7 @@
   ansible.builtin.git:
     repo: 'https://github.com/hyprwm/hyprcursor.git'
     dest: /usr/local/src/hyprcursor
-    version: v0.1.8
+    version: v0.1.9
     force: true
     recursive: true
 
@@ -85,6 +107,20 @@
     force: true
     recursive: true
 
+- name: Build hyprutils
+  ansible.builtin.command:
+    cmd: "{{ item }}"
+    chdir: /usr/local/src/hyprutils
+  loop:
+    - "cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build"
+    - "cmake --build ./build --config Release --target all"
+
+- name: Install hyprutils
+  become: yes
+  ansible.builtin.command:
+    cmd: "cmake --install build"
+    chdir: /usr/local/src/hyprutils
+
 - name: Build hyprwayland-scanner
   ansible.builtin.command:
     cmd: "{{ item }}"
diff --git a/roles/desktop-environment/tasks/main.yml b/roles/desktop-environment/tasks/main.yml
index 99e828b..4251371 100644
--- a/roles/desktop-environment/tasks/main.yml
+++ b/roles/desktop-environment/tasks/main.yml
@@ -8,4 +8,4 @@
   import_tasks: flatpak.yml
 
 - name: Include configuration steps
-  import_tasks: config.yml
\ No newline at end of file
+  import_tasks: config.yml