From d454c3cd8260910fb8c1ff7ac8b7b537e80c140e Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Sun, 6 Jul 2025 04:28:59 +0200
Subject: [PATCH] Update Fedora to 42

---
 main.yml                       | 2 +-
 roles/bootstrap/tasks/main.yml | 6 +++---
 roles/bootstrap/vars/main.yml  | 2 --
 templates/fedora.repo.j2       | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/main.yml b/main.yml
index e88ea79..034b0ba 100644
--- a/main.yml
+++ b/main.yml
@@ -49,7 +49,7 @@
           - hypervisor in ["libvirt", "proxmox", "vmware", "none"]
           - filesystem in ["btrfs", "ext4", "xfs"]
           - install_drive is defined
-          - os in ["archlinux", "almalinux", "debian11", "debian12", "fedora", "rhel8", "rhel9", "rhel10", "rocky", "ubuntu", "ubuntu-lts"]
+          - os in ["archlinux", "almalinux", "debian11", "debian12", "fedora", "rhel8", "rhel9", "rocky", "ubuntu", "ubuntu-lts"]
           - os not in ["rhel8", "rhel9", "rhel10"] or rhel_iso is defined
           - (filesystem == "btrfs" and (vm_size | int) >= 10) or (filesystem != "btrfs" and (vm_size | int) >= 20)
           - (vm_size | float) >= ((vm_memory | float / 1024 >= 16.0) | ternary((vm_memory | float / 2048), [vm_memory | float / 1024, 4.0] | max) + 16)
diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
index 8a06449..f8937ae 100644
--- a/roles/bootstrap/tasks/main.yml
+++ b/roles/bootstrap/tasks/main.yml
@@ -41,16 +41,16 @@
         - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
         - arch-chroot /mnt dnf --releasever=9 --setopt=install_weak_deps=False install -y {{ almalinux | join(' ') }}
 
-    - name: Bootstrap Fedora 41
+    - name: Bootstrap Fedora 42
       when: os | lower == 'fedora'
       ansible.builtin.command: "{{ item }}"
       changed_when: result.rc == 0
       register: result
       with_items:
-        - dnf --releasever=41 --best --repo=fedora --repo=fedora-updates
+        - dnf --releasever=42 --best --repo=fedora --repo=fedora-updates
           --installroot=/mnt --setopt=install_weak_deps=False groupinstall -y critical-path-base core
         - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
-        - arch-chroot /mnt dnf --releasever=41 --setopt=install_weak_deps=False install -y {{ fedora | join(' ') }}
+        - arch-chroot /mnt dnf --releasever=42 --setopt=install_weak_deps=False install -y {{ fedora | join(' ') }}
         - arch-chroot /mnt dnf reinstall -y kernel-core
 
     - name: Bootstrap RockyLinux 9
diff --git a/roles/bootstrap/vars/main.yml b/roles/bootstrap/vars/main.yml
index 4b39e62..e2a63e5 100644
--- a/roles/bootstrap/vars/main.yml
+++ b/roles/bootstrap/vars/main.yml
@@ -164,10 +164,8 @@ fedora:
   - cronie
   - dhcp-client
   - duf
-  - dust
   - efibootmgr
   - entr
-  - eza
   - fish
   - fzf
   - glibc-langpack-de
diff --git a/templates/fedora.repo.j2 b/templates/fedora.repo.j2
index 9e68f98..a1bab14 100644
--- a/templates/fedora.repo.j2
+++ b/templates/fedora.repo.j2
@@ -8,7 +8,7 @@ metadata_expire=86400
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=https://getfedora.org/static/fedora.gpg
+gpgkey=https://fedoraproject.org/fedora.gpg
 skip_if_unavailable=False
 
 [fedora-updates]
@@ -21,5 +21,5 @@ repo_gpgcheck=0
 type=rpm
 gpgcheck=1
 metadata_expire=86400
-gpgkey=https://getfedora.org/static/fedora.gpg
+gpgkey=https://fedoraproject.org/fedora.gpg
 skip_if_unavailable=False