From 7daca57714e1a4e613833b7e28c3abf18ab8f7c0 Mon Sep 17 00:00:00 2001
From: nocode <suzuku295@gmail.com>
Date: Wed, 24 Jun 2026 17:58:52 +0200
Subject: [PATCH] feat(anaconda): add desktop environment selection spoke for
 FWS

Implement a new Anaconda spoke that allows users to select their preferred desktop environment (CLI, GNOME, KDE Plasma, Hyprland, or XFCE) during installation.

The spoke:
- Displays radio buttons for five desktop choices with CLI as the default
- Persists the selection to /tmp/fws-desktop for the kickstart %post script
- Supports revisiting the spoke and resuming previous selections
- Includes a GTK UI definition file (glade) with translatable labels
- Integrates as a SoftwareCategory spoke in the Anaconda installer

The implementation leverages Anaconda's runtime spoke discovery mechanism via the airootfs overlay, avoiding the need to rebuild the anaconda package.
---
 .../__pycache__/fws_desktop.cpython-314.pyc   | Bin 0 -> 4538 bytes
 .../pyanaconda/ui/gui/spokes/fws_desktop.py   | 105 ++++++++++++
 .../anaconda/ui/spokes/fws_desktop.glade      | 153 ++++++++++++++++++
 .../share/anaconda/interactive-defaults.ks    |   2 +
 4 files changed, 260 insertions(+)
 create mode 100644 configs/baseline/airootfs/usr/lib/python3.14/site-packages/pyanaconda/ui/gui/spokes/__pycache__/fws_desktop.cpython-314.pyc
 create mode 100644 configs/baseline/airootfs/usr/lib/python3.14/site-packages/pyanaconda/ui/gui/spokes/fws_desktop.py
 create mode 100644 configs/baseline/airootfs/usr/share/anaconda/ui/spokes/fws_desktop.glade

diff --git a/configs/baseline/airootfs/usr/lib/python3.14/site-packages/pyanaconda/ui/gui/spokes/__pycache__/fws_desktop.cpython-314.pyc b/configs/baseline/airootfs/usr/lib/python3.14/site-packages/pyanaconda/ui/gui/spokes/__pycache__/fws_desktop.cpython-314.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5c8dabfc81f29a11f55176b6acc950c0785ff6e8
GIT binary patch
literal 4538
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

literal 0
HcmV?d00001

diff --git a/configs/baseline/airootfs/usr/lib/python3.14/site-packages/pyanaconda/ui/gui/spokes/fws_desktop.py b/configs/baseline/airootfs/usr/lib/python3.14/site-packages/pyanaconda/ui/gui/spokes/fws_desktop.py
new file mode 100644
index 0000000..b92ab7e
--- /dev/null
+++ b/configs/baseline/airootfs/usr/lib/python3.14/site-packages/pyanaconda/ui/gui/spokes/fws_desktop.py
@@ -0,0 +1,105 @@
+# FWS — Spoke « Desktop Environment » : nouvel onglet de choix du bureau.
+#
+# POURQUOI ICI (airootfs, pas dans le paquet anaconda) : Anaconda découvre les
+# spokes au RUNTIME via collect()/collect_spokes (os.listdir du dossier des
+# spokes puis import de chaque .py). Déposer ce fichier dans le dossier des
+# spokes via l'overlay airootfs suffit donc à le faire apparaître — SANS rebuild
+# du paquet anaconda (juste ./build.sh). Le glade associé est dans
+# /usr/share/anaconda/ui/spokes/fws_desktop.glade (aussi via l'airootfs).
+#
+# ⚠ Le chemin /usr/lib/python3.14/... est couplé à la version de Python d'Arch
+#   (3.14 au moment du build d'anaconda). À mettre à jour si Python change de
+#   version majeure (en même temps que le rebuild d'anaconda de toute façon).
+#
+# FONCTION : afficher 5 choix (CLI/GNOME/KDE/Hyprland/XFCE) et écrire la clé
+# choisie dans /tmp/fws-desktop. Le %post du kickstart lit ce fichier, fait
+# « pacman -S » du bureau + d'un navigateur (Firefox), et active le display
+# manager. « cli » (défaut) = aucun bureau, rien à installer.
+
+from pyanaconda.core.i18n import CN_, _
+from pyanaconda.ui.categories.software import SoftwareCategory
+from pyanaconda.ui.gui.spokes import NormalSpoke
+
+__all__ = ["FWSDesktopSpoke"]
+
+# clé interne (écrite dans /tmp/fws-desktop) → libellé affiché dans le statut.
+_CHOICES = [
+    ("cli", _("Command line only (no desktop)")),
+    ("gnome", "GNOME"),
+    ("kde", "KDE Plasma"),
+    ("hyprland", "Hyprland"),
+    ("xfce", "XFCE"),
+]
+_DESKTOP_FILE = "/tmp/fws-desktop"
+
+
+class FWSDesktopSpoke(NormalSpoke):
+    """Choix de l'environnement de bureau FWS (écrit /tmp/fws-desktop)."""
+
+    builderObjects = ["fwsDesktopWindow"]
+    mainWidgetName = "fwsDesktopWindow"
+    uiFile = "spokes/fws_desktop.glade"
+    category = SoftwareCategory
+    icon = "preferences-desktop-display-symbolic"
+    title = CN_("GUI|Spoke", "_Desktop Environment")
+
+    @staticmethod
+    def get_screen_id():
+        """Identifiant unique de cet écran."""
+        return "fws-desktop-selection"
+
+    def __init__(self, *args):
+        NormalSpoke.__init__(self, *args)
+        self._choice = "cli"
+        self._radios = {}
+
+    def initialize(self):
+        NormalSpoke.initialize(self)
+        for key, _label in _CHOICES:
+            self._radios[key] = self.builder.get_object("radio_" + key)
+        # Reprend un éventuel choix déjà écrit (revisite du spoke).
+        try:
+            with open(_DESKTOP_FILE) as fh:
+                val = fh.read().strip()
+            if val in self._radios:
+                self._choice = val
+        except OSError:
+            pass
+
+    def refresh(self):
+        # Coche le bouton correspondant au choix courant.
+        rb = self._radios.get(self._choice) or self._radios.get("cli")
+        if rb is not None:
+            rb.set_active(True)
+
+    def apply(self):
+        # Relit le bouton actif et persiste le choix pour le %post du kickstart.
+        for key, rb in self._radios.items():
+            if rb is not None and rb.get_active():
+                self._choice = key
+                break
+        try:
+            with open(_DESKTOP_FILE, "w") as fh:
+                fh.write(self._choice)
+        except OSError:
+            pass
+
+    @property
+    def status(self):
+        for key, label in _CHOICES:
+            if key == self._choice:
+                return label
+        return _("Command line only (no desktop)")
+
+    @property
+    def completed(self):
+        # « cli » est un défaut valide → le spoke n'est jamais bloquant.
+        return True
+
+    @property
+    def mandatory(self):
+        return False
+
+    @property
+    def ready(self):
+        return True
diff --git a/configs/baseline/airootfs/usr/share/anaconda/ui/spokes/fws_desktop.glade b/configs/baseline/airootfs/usr/share/anaconda/ui/spokes/fws_desktop.glade
new file mode 100644
index 0000000..00e6784
--- /dev/null
+++ b/configs/baseline/airootfs/usr/share/anaconda/ui/spokes/fws_desktop.glade
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- FWS — onglet « Desktop Environment » (choix du bureau à installer). -->
+<interface>
+  <requires lib="gtk+" version="3.6"/>
+  <requires lib="AnacondaWidgets" version="1.0"/>
+  <object class="AnacondaSpokeWindow" id="fwsDesktopWindow">
+    <property name="can-focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="window-name" translatable="yes">DESKTOP ENVIRONMENT</property>
+    <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
+    <child internal-child="main_box">
+      <object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child internal-child="nav_box">
+          <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1">
+            <property name="can-focus">False</property>
+            <child internal-child="nav_area">
+              <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
+                <property name="can-focus">False</property>
+                <property name="margin-left">6</property>
+                <property name="margin-right">6</property>
+                <property name="margin-top">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="alignment">
+          <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
+            <property name="can-focus">False</property>
+            <property name="margin-top">12</property>
+            <property name="yalign">0</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0</property>
+            <property name="bottom-padding">48</property>
+            <property name="left-padding">24</property>
+            <property name="right-padding">24</property>
+            <child internal-child="action_area">
+              <object class="GtkBox" id="AnacondaSpokeWindow-action_area1">
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">8</property>
+                <child>
+                  <object class="GtkLabel" id="fws_desktop_desc">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="wrap">True</property>
+                    <property name="max-width-chars">60</property>
+                    <property name="label" translatable="yes">Choose the desktop environment to install. A web browser (Firefox) is installed automatically with any desktop.</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="radio_cli">
+                    <property name="label" translatable="yes">Command line only (no desktop)</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="active">True</property>
+                    <property name="draw-indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="radio_gnome">
+                    <property name="label" translatable="yes">GNOME</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">radio_cli</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="radio_kde">
+                    <property name="label" translatable="yes">KDE Plasma</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">radio_cli</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="radio_hyprland">
+                    <property name="label" translatable="yes">Hyprland</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">radio_cli</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="radio_xfce">
+                    <property name="label" translatable="yes">XFCE</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="draw-indicator">True</property>
+                    <property name="group">radio_cli</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="fwsDesktopWindow-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">DESKTOP ENVIRONMENT</property>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/configs/releng/airootfs/usr/share/anaconda/interactive-defaults.ks b/configs/releng/airootfs/usr/share/anaconda/interactive-defaults.ks
index 91a1e5e..34e01cd 100644
--- a/configs/releng/airootfs/usr/share/anaconda/interactive-defaults.ks
+++ b/configs/releng/airootfs/usr/share/anaconda/interactive-defaults.ks
@@ -216,6 +216,8 @@ case "$DESK" in
     hyprland) PKGS="hyprland kitty wofi waybar sddm";                  DM="sddm" ;;
     cli|*)    PKGS="" ;;
 esac
+# Navigateur de base ajouté DÈS QU'un bureau est choisi (jamais en CLI).
+[ -n "$PKGS" ] && PKGS="$PKGS firefox"
 if [ -n "$PKGS" ]; then
     pacman-key --init            &>/dev/null || true
     pacman-key --populate archlinux &>/dev/null || true