From 0e0950d18468f1eb6d0bc55488b9228004c706d6 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andreas.mundt@steinbeisschule-reutlingen.de>
Date: Tue, 6 May 2025 13:21:29 +0200
Subject: [PATCH 1/2] Fix conditionals for ansible version in trixie

---
 roles/lmn_misc/tasks/main.yml    | 2 +-
 roles/lmn_network/tasks/main.yml | 4 ++--
 roles/lmn_printer/tasks/main.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/lmn_misc/tasks/main.yml b/roles/lmn_misc/tasks/main.yml
index 22134c5..7c15ede 100644
--- a/roles/lmn_misc/tasks/main.yml
+++ b/roles/lmn_misc/tasks/main.yml
@@ -98,7 +98,7 @@
       export superusers
       password_pbkdf2 root {{ grub_pwd }}
   notify: Run update-grub
-  when: grub_pwd|default(false)
+  when: grub_pwd | bool | default(false)
 
 - name: Allow booting grub menu entries
   ansible.builtin.lineinfile:
diff --git a/roles/lmn_network/tasks/main.yml b/roles/lmn_network/tasks/main.yml
index 7a39349..571c107 100644
--- a/roles/lmn_network/tasks/main.yml
+++ b/roles/lmn_network/tasks/main.yml
@@ -5,14 +5,14 @@
     mode: '0644'
     content: >
       {{ apt_conf }}
-  when: apt_conf|default(false)
+  when: apt_conf | bool | default(false)
 
 - name: Set NTP server
   ansible.builtin.lineinfile:
     path: /etc/systemd/timesyncd.conf
     insertafter: '^#NTP='
     line: NTP={{ ntp_serv }}
-  when: ntp_serv|default(false)
+  when: ntp_serv | bool | default(false)
 
 - name: Add proposed-updates repository
   ansible.builtin.apt_repository:
diff --git a/roles/lmn_printer/tasks/main.yml b/roles/lmn_printer/tasks/main.yml
index 960b1fa..996cb2e 100644
--- a/roles/lmn_printer/tasks/main.yml
+++ b/roles/lmn_printer/tasks/main.yml
@@ -37,7 +37,7 @@
     line: "SystemGroup root lpadmin {{ printer_admin_group }}"
     regexp: '^SystemGroup'
     state: present
-  when: printer_admin_group | length
+  when: printer_admin_group | length > 0
 
 - name: Disable cups-browsed
   ansible.builtin.systemd:

From 6063e6508943494c5111b31a5cdccd6ca24f509a Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andreas.mundt@steinbeisschule-reutlingen.de>
Date: Tue, 6 May 2025 10:01:25 +0200
Subject: [PATCH 2/2] Fixes for trixie

---
 roles/custom/fvs/tasks/main.yml    |  2 +-
 roles/lmn_kde/defaults/main.yml    |  6 +++++-
 roles/lmn_kde/tasks/main.yml       | 11 +++--------
 roles/lmn_localhome/tasks/main.yml |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/roles/custom/fvs/tasks/main.yml b/roles/custom/fvs/tasks/main.yml
index 738b4fe..3a91603 100644
--- a/roles/custom/fvs/tasks/main.yml
+++ b/roles/custom/fvs/tasks/main.yml
@@ -220,7 +220,7 @@
   ansible.builtin.blockinfile:
     path: /usr/share/sddm/themes/debian-breeze/Main.qml
     marker: // {mark} ANSIBLE MANAGED BLOCK
-    insertbefore: '\s+//Footer'
+    insertbefore: '^}$'
     block: |
       Text {
          id: hostname
diff --git a/roles/lmn_kde/defaults/main.yml b/roles/lmn_kde/defaults/main.yml
index 779142b..07685bb 100644
--- a/roles/lmn_kde/defaults/main.yml
+++ b/roles/lmn_kde/defaults/main.yml
@@ -6,6 +6,7 @@ kde_desktop_pkg:
   - calligra
   - codeblocks
   - dia
+  - filius
   - flameshot
   - freecad
   - fritzing
@@ -14,8 +15,9 @@ kde_desktop_pkg:
   - inkscape
   - kde-full
   - keepassxc
+  - kicad
+  - kicad-doc-de
   - librecad
-  - mu-editor
   - openboard
   - qtcreator
   - spyder
@@ -34,3 +36,5 @@ kde_desktop_pkg:
   - xdg-desktop-portal-kde
   - xdg-desktop-portal-wlr # share screen in browser
   - xournalpp
+
+kde_desktop_pkg_bpo: [ ]
diff --git a/roles/lmn_kde/tasks/main.yml b/roles/lmn_kde/tasks/main.yml
index 052606b..0b76358 100644
--- a/roles/lmn_kde/tasks/main.yml
+++ b/roles/lmn_kde/tasks/main.yml
@@ -8,19 +8,14 @@
     repo: deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main non-free-firmware
     state: present
     update_cache: true
+  when: kde_desktop_pkg_bpo | length > 0
 
 - name: Install extra packages from backports
   ansible.builtin.apt:
-    name:
-      - filius
-      - kicad
-      - kicad-doc-de
-      - libreoffice
-      - libreoffice-l10n-de
-      - libreoffice-qt5
-    state: latest # noqa package-latest
+    name: "{{ kde_desktop_pkg_bpo }}"
     autoremove: true
     default_release: "{{ ansible_distribution_release }}-backports"
+  when: kde_desktop_pkg_bpo | length > 0
 
 
 - name: Create akonadi config dir
diff --git a/roles/lmn_localhome/tasks/main.yml b/roles/lmn_localhome/tasks/main.yml
index 3122720..f7c54df 100644
--- a/roles/lmn_localhome/tasks/main.yml
+++ b/roles/lmn_localhome/tasks/main.yml
@@ -9,7 +9,7 @@
   ansible.builtin.blockinfile:
     path: /usr/share/sddm/themes/debian-breeze/Main.qml
     marker: // {mark} ANSIBLE MANAGED BLOCK localhome
-    insertbefore: '\s+//Footer'
+    insertbefore: '^}$'
     block: |
       Text {
          id: localhome